SERVER-22919 Shutdown cleanly after interrupting oplog application

visualzhou · visualzhou · commit daaa359b8e3c · 2016-03-04T13:57:45.000-05:00
diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp
@@ -1130,6 +1130,9 @@ void multiSyncApply(const std::vector<SyncTail::OplogEntry>& ops, SyncTail* st)
 
             if (!s.isOK()) {
                 severe() << "Error applying operation (" << entry->raw.toString() << "): " << s;
+                if (inShutdown()) {
+                    return;
+                }
                 fassertFailedNoTrace(16359);
             }
         } catch (const DBException& e) {

Original file line number	Diff line number	Diff line change
`@@ -1130,6 +1130,9 @@ void multiSyncApply(const std::vector<SyncTail::OplogEntry>& ops, SyncTail* st)`
`1130`	`1130`
`1131`	`1131`	`if (!s.isOK()) {`
`1132`	`1132`	`severe() << "Error applying operation (" << entry->raw.toString() << "): " << s;`
	`1133`	`+ if (inShutdown()) {`
	`1134`	`+ return;`
	`1135`	`+ }`
`1133`	`1136`	`fassertFailedNoTrace(16359);`
`1134`	`1137`	`}`
`1135`	`1138`	`} catch (const DBException& e) {`