diff options
| author | Judah Schvimer <judah@mongodb.com> | 2016-07-05 10:24:23 -0400 |
|---|---|---|
| committer | Judah Schvimer <judah@mongodb.com> | 2016-07-05 10:28:19 -0400 |
| commit | 44c63e6802bdbd2ceaebe1b190cd8575d073961a (patch) | |
| tree | fcac112f5c14ecba3ce4315b3dd6a381f70b3746 | |
| parent | 67602c79678d91e62b0c1bf125743ff992683a16 (diff) | |
| download | mongo-r3.2.8-rc0.tar.gz | |
SERVER-24773 _applyOplogUntil checks for shutdown while trying to pop from network queuer3.2.8-rc0
(cherry picked from commit 08ee223880898fc2153cf4eedc124fc2e4dfc133)
| -rw-r--r-- | src/mongo/db/repl/initial_sync.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mongo/db/repl/initial_sync.cpp b/src/mongo/db/repl/initial_sync.cpp index 09553e3d93e..d9373590463 100644 --- a/src/mongo/db/repl/initial_sync.cpp +++ b/src/mongo/db/repl/initial_sync.cpp @@ -74,6 +74,10 @@ void InitialSync::_applyOplogUntil(OperationContext* txn, const OpTime& endOpTim auto replCoord = repl::ReplicationCoordinator::get(txn); while (!tryPopAndWaitForMore(txn, &ops)) { + if (inShutdown()) { + return; + } + // nothing came back last time, so go again if (ops.empty()) continue; |