fixing more decision logic

Author: Tim Vaillancourt

MongoBackup/Replset.py

@@ -116,9 +116,10 @@ def find_secondary(self):
                 log_data['score']  = int(score)
                 logging.info("%s: %s" % (log_msg, str(log_data)))
         if self.secondary is None or (self.secondary['count'] + 1) < quorum_count:
+            secondary_count = self.secondary['count'] + 1 if self.secondary else 0
             logging.fatal("Not enough secondaries in replset %s to take backup! Num replset members: %i, required quorum: %i" % (
                 rs_name,
-                self.secondary['count'] + 1,
+                secondary_count,
                 quorum_count
             ))
             raise Exception, "Not enough secondaries in replset %s to safely take backup!" % rs_name, None

MongoBackup/Sharding.py

@@ -113,9 +113,10 @@ def get_configserver(self, force=False):
                 except Exception:
                     config_list = [config_string]
 
+                config_server  = config_list[0]
                 config_replset = False
                 try:
-                    config_host, config_port = config_list[0].split(":")
+                    config_host, config_port = config_server.split(":")
                     db = DB(config_host, config_port, self.user, self.password, self.authdb)
                     rs = Replset(db, self.user, self.password, self.authdb)
                     try:
@@ -126,7 +127,10 @@ def get_configserver(self, force=False):
                 except Exception, e:
                     raise e             
 
-                self.config_server = {'host': config_list[0], 'is_replset': config_replset}
+                if config_replset:
+                    config_server = rs.find_secondary()
+
+                self.config_server = {'host': config_server, 'is_replset': config_replset}
             else:
                 logging.fatal("Unable to locate config servers for %s:%i!" % (self.host, self.port))
                 raise Exception, "Unable to locate config servers for %s:%i!" % (self.host, self.port), None