From 136ee14d03553882ee2c763105df831c59e09e5b Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Mon, 16 May 2022 00:12:52 +0000 Subject: Import wiredtiger: beb7a695734861b78c3540eba0a055c1c2c7d41a from branch mongodb-master ref: 91d67b193c..beb7a69573 for: 6.1.0-rc0 WT-9307 Recreating a dropped tiered table that was never flushed panics --- src/third_party/wiredtiger/src/schema/schema_drop.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/third_party/wiredtiger/src/schema/schema_drop.c') diff --git a/src/third_party/wiredtiger/src/schema/schema_drop.c b/src/third_party/wiredtiger/src/schema/schema_drop.c index 1ce21a7916f..5411f39fe95 100644 --- a/src/third_party/wiredtiger/src/schema/schema_drop.c +++ b/src/third_party/wiredtiger/src/schema/schema_drop.c @@ -217,6 +217,7 @@ __drop_tiered(WT_SESSION_IMPL *session, const char *uri, bool force, const char WT_PREFIX_SKIP_REQUIRED(session, filename, "file:"); WT_ERR(__wt_meta_track_drop(session, filename)); } + tiered->tiers[WT_TIERED_INDEX_LOCAL].tier = NULL; } /* Close any dhandle and remove any tier: entry from metadata. */ @@ -228,6 +229,7 @@ __drop_tiered(WT_SESSION_IMPL *session, const char *uri, bool force, const char session, ret = __wt_conn_dhandle_close_all(session, tier->name, true, force))); WT_ERR(ret); WT_ERR(__wt_metadata_remove(session, tier->name)); + tiered->tiers[WT_TIERED_INDEX_SHARED].tier = NULL; } /* -- cgit v1.2.1