diff options
| author | Randolph Tan <randolph@10gen.com> | 2015-02-26 15:58:44 -0500 |
|---|---|---|
| committer | Ramon Fernandez <ramon@mongodb.com> | 2015-03-03 19:02:17 -0500 |
| commit | ee7ed05f30de291f759540923d98d5c932710f63 (patch) | |
| tree | c959b7b9e7caac0c94caea416c8f03ca763a7c58 /src | |
| parent | afc23f0987033e10ddd91317a31ecdcce6febed9 (diff) | |
| download | mongo-ee7ed05f30de291f759540923d98d5c932710f63.tar.gz | |
SERVER-17398 Deadlock in MigrateStatus::startCommit
(cherry picked from commit 7423c26ab95464a9b8f620ab4a11c297dc0621d5)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/s/d_migrate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp index fd10272b316..d31bd7d79fd 100644 --- a/src/mongo/s/d_migrate.cpp +++ b/src/mongo/s/d_migrate.cpp @@ -2537,7 +2537,7 @@ namespace mongo { while (_active) { if ( ! isActiveCV.timed_wait( lock.boost(), xt ) ){ // TIMEOUT - setState(FAIL); + _state = FAIL; log() << "startCommit never finished!" << migrateLog; return false; } |