diff options
author | Daniel Gottlieb <daniel.gottlieb@mongodb.com> | 2018-06-14 16:43:16 -0400 |
---|---|---|
committer | Daniel Gottlieb <daniel.gottlieb@mongodb.com> | 2018-06-14 20:04:28 -0400 |
commit | 34b3da52dc10216453eed6dd0939f7cb4acc546a (patch) | |
tree | 72ff103c34f4dfddd2e46f3dc0750163e25765b5 /src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp | |
parent | e08d0f6b6978bbdfa7f4e6fae5beb6df74b78433 (diff) | |
download | mongo-34b3da52dc10216453eed6dd0939f7cb4acc546a.tar.gz |
SERVER-35271: Suppress WT compatibility error messages on startup.
Diffstat (limited to 'src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp')
-rw-r--r-- | src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp index f7d8b0f4d17..4afca57ca17 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp @@ -76,7 +76,6 @@ #include "mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.h" #include "mongo/db/storage/wiredtiger/wiredtiger_session_cache.h" #include "mongo/db/storage/wiredtiger/wiredtiger_size_storer.h" -#include "mongo/db/storage/wiredtiger/wiredtiger_util.h" #include "mongo/platform/atomic_word.h" #include "mongo/stdx/memory.h" #include "mongo/util/background.h" @@ -187,6 +186,7 @@ void openWiredTiger(const std::string& path, return; } + severe() << "Failed to start up WiredTiger under any compatibility version."; if (ret == EINVAL) { fassertFailedNoTrace(28561); } @@ -449,8 +449,7 @@ WiredTigerKVEngine::WiredTigerKVEngine(const std::string& canonicalName, bool ephemeral, bool repair, bool readOnly) - : _eventHandler(WiredTigerUtil::defaultEventHandlers()), - _clockSource(cs), + : _clockSource(cs), _oplogManager(stdx::make_unique<WiredTigerOplogManager>()), _canonicalName(canonicalName), _path(path), @@ -518,7 +517,8 @@ WiredTigerKVEngine::WiredTigerKVEngine(const std::string& canonicalName, string config = ss.str(); log() << "Detected WT journal files. Running recovery from last checkpoint."; log() << "journal to nojournal transition config: " << config; - int ret = wiredtiger_open(path.c_str(), &_eventHandler, config.c_str(), &_conn); + int ret = wiredtiger_open( + path.c_str(), _eventHandler.getWtEventHandler(), config.c_str(), &_conn); if (ret == EINVAL) { fassertFailedNoTrace(28717); } else if (ret != 0) { @@ -540,7 +540,8 @@ WiredTigerKVEngine::WiredTigerKVEngine(const std::string& canonicalName, string config = ss.str(); log() << "wiredtiger_open config: " << config; - openWiredTiger(path, &_eventHandler, config, &_conn, &_fileVersion); + openWiredTiger(path, _eventHandler.getWtEventHandler(), config, &_conn, &_fileVersion); + _eventHandler.setStartupSuccessful(); _wtOpenConfig = config; { @@ -671,7 +672,8 @@ void WiredTigerKVEngine::cleanShutdown() { _conn = nullptr; WT_CONNECTION* conn; - invariantWTOK(wiredtiger_open(_path.c_str(), &_eventHandler, _wtOpenConfig.c_str(), &conn)); + invariantWTOK(wiredtiger_open( + _path.c_str(), _eventHandler.getWtEventHandler(), _wtOpenConfig.c_str(), &conn)); WT_SESSION* session; conn->open_session(conn, nullptr, "", &session); |