diff options
author | Eric Milkie <milkie@10gen.com> | 2014-12-18 10:37:31 -0500 |
---|---|---|
committer | Eric Milkie <milkie@10gen.com> | 2014-12-18 10:37:31 -0500 |
commit | 2d679247f17dab05a492c8b6d2c250dab18e54f2 (patch) | |
tree | 930b99facd5e16545dee871a892f8c1150f8b837 /src/mongo | |
parent | 723f3081a517ddfc3794c6ee4e8edd5946c86044 (diff) | |
download | mongo-2d679247f17dab05a492c8b6d2c250dab18e54f2.tar.gz |
SERVER-16313 do not abort for non-mongod with wiredtiger optionsr2.8.0-rc3
Diffstat (limited to 'src/mongo')
-rw-r--r-- | src/mongo/db/storage/wiredtiger/wiredtiger_options_init.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_options_init.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_options_init.cpp index db02d9f1951..962763fe584 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_options_init.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_options_init.cpp @@ -43,9 +43,11 @@ namespace mongo { // Make --syncdelay (syncPeriodSecs in mmapv1) an alias for checkpointDelaySecs in WT moe::Value syncdelayVal; - // syncPeriodSecs is always set since it has a default. - invariant(moe::startupOptionsParsed.get("storage.mmapv1.syncPeriodSecs", - &syncdelayVal).isOK()); + // syncPeriodSecs is always set since it has a default, for mongod. + if (!moe::startupOptionsParsed.get("storage.mmapv1.syncPeriodSecs", + &syncdelayVal).isOK()) { + return Status::OK(); + } // Ignore override if set to default of 60. if (syncdelayVal.equal(moe::Value(60.0))) { return Status::OK(); |