diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-09-09 16:05:15 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-09-09 06:34:14 +0000 |
| commit | adbe39ee1e6f3563f0012a03a99d29562aed97c0 (patch) | |
| tree | 9333c3c734fc26ed2716c642de15e525a3cdd9f7 | |
| parent | 45a16968d4940c7865e1a3e6d3e2b726f3a03336 (diff) | |
| download | mongo-adbe39ee1e6f3563f0012a03a99d29562aed97c0.tar.gz | |
Import wiredtiger: 672be218bfa99c082c1bcd62f53bf1ad2211239e from branch mongodb-6.1
ref: 30c7dcaef3..672be218bf
for: 6.1.0-rc2
WT-9838 Allow checkpoint when creating first object. (#8250)
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/block_cache/block_mgr.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index d7017d90b1e..0a0a45415c3 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-6.1", - "commit": "30c7dcaef3d9593e1985eed2132c39d0d4f1b66a" + "commit": "672be218bfa99c082c1bcd62f53bf1ad2211239e" } diff --git a/src/third_party/wiredtiger/src/block_cache/block_mgr.c b/src/third_party/wiredtiger/src/block_cache/block_mgr.c index ca2cee442cf..b90d852fc0c 100644 --- a/src/third_party/wiredtiger/src/block_cache/block_mgr.c +++ b/src/third_party/wiredtiger/src/block_cache/block_mgr.c @@ -600,8 +600,11 @@ __bm_switch_object(WT_BM *bm, WT_SESSION_IMPL *session, uint32_t objectid) current = bm->block; - /* There should not be a checkpoint in progress. */ - WT_ASSERT(session, !S2C(session)->txn_global.checkpoint_running); + /* + * There should not be a checkpoint in progress if we are switching objects. It is allowed if we + * are creating the first tiered object. + */ + WT_ASSERT(session, !S2C(session)->txn_global.checkpoint_running || objectid == 1); WT_RET(__wt_blkcache_tiered_open(session, NULL, objectid, &block)); |