diff options
| author | Eric Milkie <milkie@10gen.com> | 2015-03-04 09:44:20 -0500 |
|---|---|---|
| committer | Benety Goh <benety@mongodb.com> | 2017-05-19 10:44:24 -0400 |
| commit | 98fdade3b05d4221d74cc07381dccace732abf48 (patch) | |
| tree | 3f56d19c2ce0639976341889364e77cf353f2473 | |
| parent | 72111843e483782ecbe66beb3c15aa6cfeee16c7 (diff) | |
| download | mongo-98fdade3b05d4221d74cc07381dccace732abf48.tar.gz | |
SERVER-17435 do not abort if opid changes while killing all ops in killAllUserOperations()
(cherry picked from commit eb9785c12b4b88d76e00321440c8d635f296448a)
| -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 a4acd47744b..b65288767a7 100644 --- a/src/mongo/db/global_environment_d.cpp +++ b/src/mongo/db/global_environment_d.cpp @@ -234,7 +234,10 @@ void GlobalEnvironmentMongoD::killAllUserOperations(const OperationContext* txn) bool found = _killOperationsAssociatedWithClientAndOpId_inlock(client, client->curop()->opNum()); - invariant(found); + if (!found) { + warning() << "Attempted to kill operation " << client->curop()->opNum() + << " but the opId changed"; + } } } |