diff options
author | Daniel Gottlieb <daniel.gottlieb@mongodb.com> | 2017-08-30 09:45:56 -0400 |
---|---|---|
committer | Daniel Gottlieb <daniel.gottlieb@mongodb.com> | 2017-08-30 14:21:57 -0400 |
commit | 697832f5474879c32713f78c5a9e27bbd2c5d19d (patch) | |
tree | 5fe45bd16c1349578664c0bb3fa902b438bf4161 | |
parent | d6bf4c26878a61513b0a1cc92e2955330a02d0a8 (diff) | |
download | mongo-697832f5474879c32713f78c5a9e27bbd2c5d19d.tar.gz |
SERVER-30885: Remove staging flag for 3.6 -> 3.4 storage downgrade
-rw-r--r-- | src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp index 7ef9bf9cdf3..f0c6329ff4a 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp @@ -494,23 +494,15 @@ void WiredTigerKVEngine::cleanShutdown() { closeConfig = "leak_memory=true"; } - const bool keepOldBehavior = true; const bool needsDowngrade = !_readOnly && serverGlobalParams.featureCompatibility.version.load() == ServerGlobalParams::FeatureCompatibility::Version::k34; - if (keepOldBehavior && needsDowngrade) { - // When Recover to a timestamp is turned on (SERVER-30349), this block can go - // away. The 3.4 downgrade block below that restarts WT will run the following - // `reconfigure` at the very end after reverting all table logging. - log() << "Downgrading WiredTiger to 2.9"; - invariantWTOK(_conn->reconfigure(_conn, "compatibility=(release=2.9)")); - } invariantWTOK(_conn->close(_conn, closeConfig)); _conn = nullptr; // If FCV 3.4, enable WT logging on all tables. - if (!keepOldBehavior && needsDowngrade) { + if (needsDowngrade) { // Steps for downgrading: // // 1) Close and reopen WiredTiger. This clears out any leftover cursors that get in |