mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

SERVER-24878 capture InterruptedAtShutdown when replicating for all code paths

Browse Source
This commit is contained in:
Eric Milkie 2016-07-07 10:28:40 -04:00
parent 56ad85cdf0
commit aac4bf9513
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/mongo/db/repl/sync_tail.cpp
View File

@ -302,7 +302,7 @@ Status SyncTail::syncApply(OperationContext* txn,
ApplyCommandInLockFn applyCommandInLock,
IncrementOpsAppliedStatsFn incrementOpsAppliedStats) {
if (inShutdown()) {
return Status::OK();
return Status(ErrorCodes::InterruptedAtShutdown, "syncApply shutting down");
}
// Count each log op application as a separate operation, for reporting purposes
@ -1005,7 +1005,9 @@ void multiSyncApply(MultiApplier::OperationPtrs* ops, SyncTail*) {
auto syncApply = [](OperationContext* txn, const BSONObj& op, bool convertUpdateToUpsert) {
return SyncTail::syncApply(txn, op, convertUpdateToUpsert);
};
fassertNoTrace(16359, multiSyncApply_noAbort(txn.get(), ops, syncApply));
auto status = multiSyncApply_noAbort(txn.get(), ops, syncApply);
fassertNoTrace(16359, status.isOK() || status == ErrorCodes::InterruptedAtShutdown);
}
Status multiSyncApply_noAbort(OperationContext* txn,
@ -1081,8 +1083,7 @@ Status multiSyncApply_noAbort(OperationContext* txn,
// The group insert failed, log an error and fall through to the
// application of an individual op.
if (e.toStatus() == ErrorCodes::InterruptedAtShutdown) {
// Swallow this error to prevent fassert and nonzero exit code.
return Status::OK();
return e.toStatus();
}
str::stream msg;
@ -1099,24 +1100,16 @@ Status multiSyncApply_noAbort(OperationContext* txn,
try {
// Apply an individual (non-grouped) op.
const Status s = syncApply(txn, entry->raw, convertUpdatesToUpserts);
const Status status = syncApply(txn, entry->raw, convertUpdatesToUpserts);
if (!s.isOK()) {
severe() << "Error applying operation (" << entry->raw.toString() << "): " << s;
if (inShutdown()) {
return {ErrorCodes::InterruptedAtShutdown, s.toString()};
}
return s;
if (!status.isOK()) {
severe() << "Error applying operation (" << entry->raw.toString()
<< "): " << status;
return status;
}
} catch (const DBException& e) {
severe() << "writer worker caught exception: " << causedBy(e)
<< " on: " << entry->raw.toString();
if (e.toStatus() == ErrorCodes::InterruptedAtShutdown) {
// Swallow this error to prevent fassert and nonzero exit code.
return Status::OK();
}
return e.toStatus();
}
}
@ -1128,7 +1121,8 @@ Status multiSyncApply_noAbort(OperationContext* txn,
void multiInitialSyncApply(MultiApplier::OperationPtrs* ops, SyncTail* st) {
initializeWriterThread();
auto txn = cc().makeOperationContext();
fassertNoTrace(15915, multiInitialSyncApply_noAbort(txn.get(), ops, st));
auto status = multiInitialSyncApply_noAbort(txn.get(), ops, st);
fassertNoTrace(15915, status.isOK() || status == ErrorCodes::InterruptedAtShutdown);
}
Status multiInitialSyncApply_noAbort(OperationContext* txn,
@ -1167,12 +1161,6 @@ Status multiInitialSyncApply_noAbort(OperationContext* txn,
}
severe() << "writer worker caught exception: " << causedBy(e) << " on: " << entry.raw;
if (e.toStatus() == ErrorCodes::InterruptedAtShutdown) {
// Swallow this error to prevent fassert and nonzero exit code.
return Status::OK();
}
return e.toStatus();
}
}

6
src/mongo/util/assert_util.h
View File

@ -220,6 +220,12 @@ inline void fassert(int msgid, const Status& status) {
}
}
inline void fassertNoTrace(int msgid, bool testOK) {
if (MONGO_unlikely(!testOK)) {
fassertFailedNoTrace(msgid);
}
}
inline void fassertNoTrace(int msgid, const Status& status) {
if (MONGO_unlikely(!status.isOK())) {
fassertFailedWithStatusNoTrace(msgid, status);