[PATCH] compaction: Fix incremental compaction logging

2 views
Skip to first unread message

Raphael S. Carvalho

<raphaelsc@scylladb.com>
unread,
May 24, 2022, 7:22:53 PM5/24/22
to scylladb-dev@googlegroups.com, Raphael S. Carvalho
The messages only dumps the last sealed fragment, but it should dump
all the output fragments replacing the exhausted input ones.

Let's print origin of output fragments, so we can differ between
files with compaction and garbage-collection origin.

Signed-off-by: Raphael S. Carvalho <raph...@scylladb.com>
---
tests: dev. as it's a simple logging change, decided to not spit a new CI run
---
compaction/compaction.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compaction/compaction.cc b/compaction/compaction.cc
index 3b71f9190..238e95235 100644
--- a/compaction/compaction.cc
+++ b/compaction/compaction.cc
@@ -1020,7 +1020,7 @@ class regular_compaction : public compaction {
_new_unused_sstables.insert(_new_unused_sstables.end(), unused_gc_sstables.begin(), unused_gc_sstables.end());

auto exhausted_ssts = std::vector<shared_sstable>(exhausted, _sstables.end());
- log_debug("Replacing earlier exhausted sstable(s) {} by new sstable {}", formatted_sstables_list(exhausted_ssts, false), sst->get_filename());
+ log_debug("Replacing earlier exhausted sstable(s) {} by new sstable(s) {}", formatted_sstables_list(exhausted_ssts, false), formatted_sstables_list(_new_unused_sstables, true));
_replacer(get_compaction_completion_desc(exhausted_ssts, std::move(_new_unused_sstables)));
_sstables.erase(exhausted, _sstables.end());
_monitor_generator.remove_exhausted_sstables(exhausted_ssts);
--
2.35.1

Benny Halevy

<bhalevy@scylladb.com>
unread,
May 25, 2022, 12:36:08 AM5/25/22
to Raphael S. Carvalho, scylladb-dev
LGTM

Needs a CI run

--
You received this message because you are subscribed to the Google Groups "ScyllaDB development" group.
To unsubscribe from this group and stop receiving emails from it, send an email to scylladb-dev...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/scylladb-dev/20220524232232.119520-1-raphaelsc%40scylladb.com.

Raphael S. Carvalho

<raphaelsc@scylladb.com>
unread,
May 25, 2022, 9:27:39 AM5/25/22
to Benny Halevy, scylladb-dev
On Wed, May 25, 2022 at 1:36 AM Benny Halevy <bha...@scylladb.com> wrote:
>
> LGTM
>
> Needs a CI run

I remember when reading the introduction of CI, that very simple
changes may not require a CI run. Is that restricted to even simpler
changes like renaming or comment / documentation typo fixing?

Raphael S. Carvalho

<raphaelsc@scylladb.com>
unread,
May 25, 2022, 9:32:25 AM5/25/22
to Benny Halevy, scylladb-dev
On Wed, May 25, 2022 at 10:27 AM Raphael S. Carvalho
<raph...@scylladb.com> wrote:
>
> On Wed, May 25, 2022 at 1:36 AM Benny Halevy <bha...@scylladb.com> wrote:
> >
> > LGTM
> >
> > Needs a CI run
>
> I remember when reading the introduction of CI, that very simple
> changes may not require a CI run. Is that restricted to even simpler
> changes like renaming or comment / documentation typo fixing?

started the CI already, will share it once it completes successfully. thx!

Raphael S. Carvalho

<raphaelsc@scylladb.com>
unread,
May 25, 2022, 1:39:54 PM5/25/22
to Benny Halevy, scylladb-dev, Maintainers
https://jenkins.scylladb.com/job/releng/job/Scylla-CI/545/

On Wed, May 25, 2022 at 10:32 AM Raphael S. Carvalho

Commit Bot

<bot@cloudius-systems.com>
unread,
May 30, 2022, 8:58:24 AM5/30/22
to scylladb-dev@googlegroups.com, Raphael S. Carvalho
From: Raphael S. Carvalho <raph...@scylladb.com>
Committer: Botond Dénes <bde...@scylladb.com>
Branch: next

compaction: Fix incremental compaction logging

The messages only dumps the last sealed fragment, but it should dump
all the output fragments replacing the exhausted input ones.

Let's print origin of output fragments, so we can differ between
files with compaction and garbage-collection origin.

Signed-off-by: Raphael S. Carvalho <raph...@scylladb.com>
Message-Id: <20220524232232.1...@scylladb.com>

---
diff --git a/compaction/compaction.cc b/compaction/compaction.cc

Commit Bot

<bot@cloudius-systems.com>
unread,
May 30, 2022, 12:24:08 PM5/30/22
to scylladb-dev@googlegroups.com, Raphael S. Carvalho
From: Raphael S. Carvalho <raph...@scylladb.com>
Committer: Botond Dénes <bde...@scylladb.com>
Branch: master

compaction: Fix incremental compaction logging

The messages only dumps the last sealed fragment, but it should dump
all the output fragments replacing the exhausted input ones.

Let's print origin of output fragments, so we can differ between
files with compaction and garbage-collection origin.

Signed-off-by: Raphael S. Carvalho <raph...@scylladb.com>
Message-Id: <20220524232232.1...@scylladb.com>

---
diff --git a/compaction/compaction.cc b/compaction/compaction.cc
Reply all
Reply to author
Forward
0 new messages