From cb2e7e34d5a2dddeba4eaffece4af7fadcf615a2 Mon Sep 17 00:00:00 2001
From: Spencer T Brody <spencer@10gen.com>
Date: Wed, 24 Oct 2012 22:56:06 -0400
Subject: [PATCH] Decrease timeout on replication catching up in migration
 SERVER-7472

---
 src/mongo/s/d_migrate.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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;