summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/src/block_cache/block_mgr.c
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2022-02-22 13:40:37 +1100
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-02-22 03:06:00 +0000
commitbd2abb1b3c22d071e7138b7e3edeeb5943690e5c (patch)
treebc3cde67273e07c849783fb684b020a923087b52 /src/third_party/wiredtiger/src/block_cache/block_mgr.c
parent10f64703a649ce5f2b927585966fc30bc90dd70f (diff)
downloadmongo-bd2abb1b3c22d071e7138b7e3edeeb5943690e5c.tar.gz
Import wiredtiger: b1a6788043f564c5fe1956ceb94307cdd47ff9ca from branch mongodb-5.3r5.3.0-rc1r5.3
ref: 11425af9b5..b1a6788043 for: 5.3.0-rc1 WT-7596 Clean up internal interface for tiered switch to new object
Diffstat (limited to 'src/third_party/wiredtiger/src/block_cache/block_mgr.c')
-rw-r--r--src/third_party/wiredtiger/src/block_cache/block_mgr.c14
1 files changed, 2 insertions, 12 deletions
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 ef480c18942..3e7df914f4d 100644
--- a/src/third_party/wiredtiger/src/block_cache/block_mgr.c
+++ b/src/third_party/wiredtiger/src/block_cache/block_mgr.c
@@ -560,7 +560,7 @@ __bm_stat(WT_BM *bm, WT_SESSION_IMPL *session, WT_DSRC_STATS *stats)
* Switch the tiered object.
*/
static int
-__bm_switch_object(WT_BM *bm, WT_SESSION_IMPL *session, uint32_t objectid, uint32_t flags)
+__bm_switch_object(WT_BM *bm, WT_SESSION_IMPL *session, uint32_t objectid)
{
WT_BLOCK *block;
@@ -570,15 +570,6 @@ __bm_switch_object(WT_BM *bm, WT_SESSION_IMPL *session, uint32_t objectid, uint3
WT_RET(__bm_close_block(session, block));
bm->block = NULL;
- /*
- * FIXME-WT-7596 the flags argument will be used in the future to perform various tasks,
- * to efficiently mark objects in transition (that is during a switch):
- * - mark this file as the writeable file (what currently happens)
- * - disallow writes to this object (reads still allowed, we're about to switch)
- * - close this object (about to move it, don't allow reopens yet)
- * - allow opens on this object again
- */
- WT_UNUSED(flags);
WT_RET(__wt_blkcache_get_handle(session, NULL, objectid, &block));
/*
@@ -603,10 +594,9 @@ __bm_switch_object(WT_BM *bm, WT_SESSION_IMPL *session, uint32_t objectid, uint3
* Switch the tiered object; readonly version.
*/
static int
-__bm_switch_object_readonly(WT_BM *bm, WT_SESSION_IMPL *session, uint32_t objectid, uint32_t flags)
+__bm_switch_object_readonly(WT_BM *bm, WT_SESSION_IMPL *session, uint32_t objectid)
{
WT_UNUSED(objectid);
- WT_UNUSED(flags);
return (__bm_readonly(bm, session));
}