diff options
author | Spencer T Brody <spencer@10gen.com> | 2012-10-24 22:56:06 -0400 |
---|---|---|
committer | Spencer T Brody <spencer@10gen.com> | 2012-11-16 17:35:21 -0500 |
commit | cb2e7e34d5a2dddeba4eaffece4af7fadcf615a2 (patch) | |
tree | f6f81ef67a7cef96a54b572682a03990549e5308 | |
parent | c527cc73e265b647b96b0d84e620c3d75ecd0a1d (diff) | |
download | mongo-cb2e7e34d5a2dddeba4eaffece4af7fadcf615a2.tar.gz |
Decrease timeout on replication catching up in migration SERVER-7472
-rw-r--r-- | src/mongo/s/d_migrate.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp index 42c57f81a30..db7c2c055af 100644 --- a/src/mongo/s/d_migrate.cpp +++ b/src/mongo/s/d_migrate.cpp @@ -1597,6 +1597,8 @@ namespace mongo { // this will prevent us from going into critical section until we're ready Timer t; while ( t.minutes() < 600 ) { + log() << "Waiting for replication to catch up before entering critical section" + << endl; if ( flushPendingWrites( lastOpApplied ) ) break; sleepsecs(1); @@ -1786,7 +1788,8 @@ namespace mongo { Timer t; // we wait for the commit to succeed before giving up - while ( t.minutes() <= 5 ) { + while ( t.seconds() <= 30 ) { + log() << "Waiting for commit to finish" << endl; sleepmillis(1); if ( state == DONE ) return true; |