summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2023-03-17 13:47:57 +1100
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2023-03-17 03:11:48 +0000
commit7d9a019c42755eb03036150eec7ee019af59fc16 (patch)
tree633be9eba15ef1f6af7339260a1aa43dd4381317
parent6cdf0c2a0f998000f963b91631e1e615ec2977aa (diff)
downloadmongo-7d9a019c42755eb03036150eec7ee019af59fc16.tar.gz
Import wiredtiger: c1e0d4e16d27c0e5e96bfd039762ca9f4fda6f7b from branch mongodb-5.0
ref: 8dc28197e9..c1e0d4e16d for: 5.0.16 WT-9629 Fix collection of compact progress statistics (v5.0 backport)
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/block/block_compact.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 1fa8bd259f9..2d7da58ae52 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
"vendor": "wiredtiger",
"github": "wiredtiger/wiredtiger.git",
"branch": "mongodb-5.0",
- "commit": "8dc28197e96983d6441dbefdc679312b01c7dfae"
+ "commit": "c1e0d4e16d27c0e5e96bfd039762ca9f4fda6f7b"
}
diff --git a/src/third_party/wiredtiger/src/block/block_compact.c b/src/third_party/wiredtiger/src/block/block_compact.c
index 58deed3cb89..aba4b7a1b73 100644
--- a/src/third_party/wiredtiger/src/block/block_compact.c
+++ b/src/third_party/wiredtiger/src/block/block_compact.c
@@ -212,6 +212,12 @@ __compact_page_skip(
}
}
__wt_spin_unlock(session, &block->live_lock);
+
+ ++block->compact_pages_reviewed;
+ if (*skipp)
+ ++block->compact_pages_skipped;
+ else
+ ++block->compact_pages_rewritten;
}
/*
@@ -235,12 +241,6 @@ __wt_block_compact_page_skip(
__compact_page_skip(session, block, offset, size, skipp);
- ++block->compact_pages_reviewed;
- if (*skipp)
- ++block->compact_pages_skipped;
- else
- ++block->compact_pages_rewritten;
-
return (0);
}