diff options
| author | Eric Milkie <milkie@10gen.com> | 2015-03-04 09:44:20 -0500 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2015-03-06 09:34:18 -0500 |
| commit | eb9785c12b4b88d76e00321440c8d635f296448a (patch) | |
| tree | 576a3e55f0bb08d8bd908331e270bae9fc09fe13 | |
| parent | bbe711f9199795db87660b2eaad4266875caa5bd (diff) | |
| download | mongo-eb9785c12b4b88d76e00321440c8d635f296448a.tar.gz | |
SERVER-17435 do not abort if opid changes while killing all ops in killAllUserOperations()
| -rw-r--r-- | src/mongo/db/global_environment_d.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mongo/db/global_environment_d.cpp b/src/mongo/db/global_environment_d.cpp index e4fa3c30069..6f94d2a0f11 100644 --- a/src/mongo/db/global_environment_d.cpp +++ b/src/mongo/db/global_environment_d.cpp @@ -241,7 +241,10 @@ namespace mongo { bool found = _killOperationsAssociatedWithClientAndOpId_inlock( client, client->curop()->opNum()); - invariant(found); + if (!found) { + warning() << "Attempted to kill operation " << client->curop()->opNum() + << " but the opId changed"; + } } } |