diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2017-04-17 17:59:05 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2017-04-17 17:59:05 -0400 |
| commit | 01f3ea709b47de751f2927e0e6a0b9a919ad3b09 (patch) | |
| tree | 38fddb9fe75931df7665dff5eb3db83fa0d870d2 | |
| parent | e1469b080645655377e93f4e057ee5aca0e62f37 (diff) | |
| download | mongo-01f3ea709b47de751f2927e0e6a0b9a919ad3b09.tar.gz | |
SERVER-25210 Deadlock in Master/Slave Startup
(cherry picked from commit 34aca01d24361e1a71c0888ba5bbce451df7ce05)
| -rw-r--r-- | etc/evergreen.yml | 5 | ||||
| -rw-r--r-- | src/mongo/db/db.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index c1b28564481..427b4a3146b 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1726,6 +1726,7 @@ tasks: - <<: *task_template name: sharding + exec_timeout_secs: 28800 # 8 hour timeout for the task overall commands: - func: "do setup" - func: "run tests" @@ -1735,6 +1736,7 @@ tasks: - <<: *task_template name: sharding_WT + exec_timeout_secs: 28800 # 8 hour timeout for the task overall commands: - func: "do setup" - func: "run tests" @@ -1769,6 +1771,7 @@ tasks: - <<: *task_template name: sharding_WT_ese + exec_timeout_secs: 28800 # 8 hour timeout for the task overall commands: - func: "do setup" - func: "run tests" @@ -1787,6 +1790,7 @@ tasks: - <<: *task_template name: sharding_auth + exec_timeout_secs: 28800 # 8 hour timeout for the task overall commands: - func: "do setup" - func: "run tests" @@ -1798,6 +1802,7 @@ tasks: name: sharding_auth_audit_WT depends_on: - name: sharding_auth + exec_timeout_secs: 28800 # 8 hour timeout for the task overall commands: - func: "do setup" - func: "run tests" diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp index 2535c2b83d2..f5346915216 100644 --- a/src/mongo/db/db.cpp +++ b/src/mongo/db/db.cpp @@ -742,6 +742,8 @@ void _initAndListen(int listenPort) { "data." << startupWarningsLog; } + logStartup(startupOpCtx.get()); + getDeleter()->startWorkers(); restartInProgressIndexesFromLastShutdown(startupOpCtx.get()); @@ -778,8 +780,6 @@ void _initAndListen(int listenPort) { uassertStatusOK(ShardingStateRecovery::recover(startupOpCtx.get())); } - logStartup(startupOpCtx.get()); - // MessageServer::run will return when exit code closes its socket and we don't need the // operation context anymore startupOpCtx.reset(); |