summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Williams <louis.williams@mongodb.com>2020-02-24 09:43:58 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-02-26 20:16:07 +0000
commit0df06232295d40295d874fe97fd532f107b4557f (patch)
treee425072567632bc591f5ced734c217d1b269850c
parent1939a3ca2a29d22e7b9976171bf2cc54bd9a1846 (diff)
downloadmongo-0df06232295d40295d874fe97fd532f107b4557f.tar.gz
SERVER-45935 WT error handler can incorrectly print 'An unsupported journal format detected'
-rw-r--r--src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
index dd5803d22e3..389dfcb7072 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
@@ -410,7 +410,8 @@ int mdb_handle_error_with_startup_suppression(WT_EVENT_HANDLER* handler,
StringData sd(message);
error() << "WiredTiger error (" << errorCode << ") " << redact(message)
<< " Raw: " << message;
- if (sd.find("this build requires a maximum version of 2, and the file is version 3")) {
+ if (sd.find("this build requires a maximum version of 2, and the file is version 3") !=
+ std::string::npos) {
error()
<< "An unsupported journal format detected - If you are trying to rollback from "
"version 4.0 to 3.6, please re-start a 4.0 binary and cleanly shut it down so "