buildbot fix

awaitReplication now waits for config numbers as well as optime to be synchronize before proceeding
(in some tests we were awaiting replication after a config change, which didn't make sense)

1 files changed, 11 insertions, 0 deletions

diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js
index 6b670fb1644..ea88e9cebb5 100644
--- a/src/mongo/shell/replsettest.js
+++ b/src/mongo/shell/replsettest.js
@@ -528,6 +528,8 @@ ReplSetTest.prototype.awaitReplication = function(timeout) {
     print("ReplSetTest awaitReplication: starting: timestamp for primary, " +
           name + ", is " + tojson(this.latest));
 
+    var configVersion = this.liveNodes.master.getDB("local")['system.replset'].findOne().version;
+
     var self = this;
     assert.soon( function() {
                      try {
@@ -583,6 +585,15 @@ ReplSetTest.prototype.awaitReplication = function(timeout) {
                                        secondaryCount + ", " + name + ", to have an oplog built");
                                  return false;
                              }
+
+                             var slaveConfigVersion = slave.getDB("local")['system.replset'].findOne().version;
+
+                             if (configVersion != slaveConfigVersion) {
+                                 print("ReplSetTest awaitReplication: secondary #" + secondaryCount +
+                                       ", " + name + ", has config version #" + slaveConfigVersion +
+                                       ", but expected config version #" + configVersion);
+                                 return false;
+                             }
                          }
 
                          print("ReplSetTest awaitReplication: finished: all " + secondaryCount +