diff options
Diffstat (limited to 'src/mongo/db/repl')
-rw-r--r-- | src/mongo/db/repl/bgsync.cpp | 5 | ||||
-rw-r--r-- | src/mongo/db/repl/rs_initialsync.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/repl/sync_source_feedback.cpp | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/mongo/db/repl/bgsync.cpp b/src/mongo/db/repl/bgsync.cpp index 1d187b9d36e..4ca424574fc 100644 --- a/src/mongo/db/repl/bgsync.cpp +++ b/src/mongo/db/repl/bgsync.cpp @@ -45,6 +45,7 @@ #include "mongo/db/repl/rs_rollback.h" #include "mongo/db/repl/rs_sync.h" #include "mongo/db/stats/timer_stats.h" +#include "mongo/util/exit.h" #include "mongo/util/fail_point_service.h" #include "mongo/util/log.h" @@ -206,10 +207,10 @@ namespace { } // Wait until we've applied the ops we have before we choose a sync target - while (!_appliedBuffer && !inShutdown()) { + while (!_appliedBuffer && !inShutdownStrict()) { _condvar.wait(lock); } - if (inShutdown()) { + if (inShutdownStrict()) { return; } } diff --git a/src/mongo/db/repl/rs_initialsync.cpp b/src/mongo/db/repl/rs_initialsync.cpp index b35ea5f45ea..7091b2b1a70 100644 --- a/src/mongo/db/repl/rs_initialsync.cpp +++ b/src/mongo/db/repl/rs_initialsync.cpp @@ -47,6 +47,7 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/oplogreader.h" #include "mongo/db/repl/repl_coordinator_global.h" +#include "mongo/util/exit.h" #include "mongo/util/log.h" #include "mongo/util/mongoutils/str.h" diff --git a/src/mongo/db/repl/sync_source_feedback.cpp b/src/mongo/db/repl/sync_source_feedback.cpp index 459e5d91962..a7bdacc0c6b 100644 --- a/src/mongo/db/repl/sync_source_feedback.cpp +++ b/src/mongo/db/repl/sync_source_feedback.cpp @@ -44,6 +44,7 @@ #include "mongo/db/repl/bgsync.h" #include "mongo/db/repl/repl_coordinator_global.h" #include "mongo/db/operation_context.h" +#include "mongo/util/exit.h" #include "mongo/util/log.h" #include "mongo/util/net/hostandport.h" |