ignore slaveDelay until initial sync is complete

db/repl/rs_sync.cpp

@@ -289,7 +289,9 @@ namespace mongo {
                     BSONObj o = r.nextSafe(); /* note we might get "not master" at some point */
 
                     int sd = myConfig().slaveDelay;
-                    if( sd ) { 
+                    // ignore slaveDelay if the box is still initializing. once
+                    // it becomes secondary we can worry about it.
+                    if( sd && box.getState().secondary() ) { 
                         const OpTime ts = o["ts"]._opTime();
                         long long a = ts.getSecs();
                         long long b = time(0);

jstests/replsets/slaveDelay2.js

@@ -0,0 +1,104 @@
+
+var name = "slaveDelay2";
+var host = getHostName();
+
+var waitForAllMembers = function(master) {
+  var ready = false;
+
+  outer:
+  while (true) {
+    var state = master.getSisterDB("admin").runCommand({replSetGetStatus:1});
+
+    for (var m in state.members) {
+      if (state.members[m].state != 2 && state.members[m].state != 1) {
+        sleep(10000);
+        continue outer;
+      }
+    }
+
+    printjson(state);
+    print("okay, everyone is primary or secondary");
+    return;
+  }
+};
+
+
+var initialize = function() {
+  var replTest = new ReplSetTest( {name: name, nodes: 1} );
+
+  var nodes = replTest.startSet();
+  
+  replTest.initiate();
+
+  var master = replTest.getMaster().getDB(name);
+
+  waitForAllMembers(master);
+  
+  return replTest;
+};
+
+var populate = function(master) {
+  // insert records
+  for (var i =0; i<1000; i++) {
+    master.foo.insert({_id:1});
+  }
+  
+  master.runCommand({getlasterror:1});
+}
+
+doTest = function( signal ) {
+  var replTest = initialize();
+  var master = replTest.getMaster().getDB(name);
+  populate(master);
+  var admin = master.getSisterDB("admin");
+    
+  /**
+   * start a slave with a long delay (1 hour) and do some writes while it is
+   * initializing. Make sure it syncs all of these writes before going into
+   * syncDelay.
+   */
+  var conn = startMongodTest( 31008 , name+"-sd" , 0 , {useHostname : true, replSet : name} );
+  conn.setSlaveOk();
+  
+  config = master.getSisterDB("local").system.replset.findOne();
+  config.version++;
+  config.members.push({_id : 1, host : host+":31008",priority:0, slaveDelay:3600});
+  var ok = admin.runCommand({replSetReconfig : config});
+  assert.eq(ok.ok,1);
+
+  // do inserts during initial sync
+  count = 0;
+  while (count < 10) {
+    for (var i = 100*count; i<100*(count+1); i++) {
+      master.foo.insert({x:i});
+    }
+
+    //check if initial sync is done
+    var state = master.getSisterDB("admin").runCommand({replSetGetStatus:1});
+    printjson(state);
+    if (state.members[1].state == 2) {
+      break;
+    }
+    
+    count++;
+  }
+  
+  // throw out last 100 inserts, but make sure the others were applied
+  if (count == 0) {
+    print("NOTHING TO CHECK");
+    replTest.stopSet();
+    return;
+  }
+
+  // wait a bit for the syncs to be applied
+  waitForAllMembers(master);    
+
+  for (var i=0; i<(100*count); i++) {
+    var obj = conn.getDB(name).foo.findOne({x : i});
+    assert(obj);
+  }
+    
+  replTest.stopSet();
+}
+
+doTest(15);