broke get_configserver into 2 x defs and resolved some bugs

Author: Tim Vaillancourt

MongoBackup/Backup.py

@@ -282,7 +282,7 @@ def run(self):
                     self.user,
                     self.password,
                     self.authdb,
-                    self.sharding.get_configserver(),
+                    self.sharding.get_config_server(),
                     self.verbose
                 )
                 self.mongodumper_summary = self.mongodumper.run()

MongoBackup/Methods/Dumper.py

@@ -20,10 +20,14 @@ def __init__(self, secondaries, base_dir, binary, dump_gzip=False, user=None, pa
         self.config_server = config_server
         self.verbose       = verbose
 
+        self.config_replset = False
         self.response_queue = Queue()
         self.threads        = []
         self._summary       = {}
 
+        if not isinstance(self.config_server, dict) and self.config_server in self.secondaries:
+            self.config_replset = True
+
         if not isinstance(self.secondaries, dict):
             raise Exception, "Field 'secondaries' must be a dictionary of secondary info (by shard)!", None
 
@@ -77,22 +81,6 @@ def run(self):
             )
             self.threads.append(thread)
 
-        # backup a single replica-set config server alongside the shards, if exists:
-        if self.config_server and self.config_server['replSet']:
-            thread = Dump(
-                self.response_queue,
-                'config',
-                self.config_server['host'],
-                self.user,
-                self.password,
-                self.authdb,
-                self.base_dir,
-                self.binary,
-                self.dump_gzip,
-                self.verbose
-            )
-            self.threads.append(thread)
-
         if not len(self.threads) > 0:
             raise Exception, 'No backup threads started!', None
 
@@ -104,11 +92,11 @@ def run(self):
         self.wait()
 
         # backup a single non-replset config server, if exists:
-        if self.config_server and not self.config_server['replSet']:
-            logging.debug("Using non-replset backup method for config server")
+        if not self.config_replset and isinstance(self.config_server, dict):
+            logging.info("Using non-replset backup method for config server")
             thread = Dump(
                 self.response_queue,
-                'config',
+                'configsvr',
                 self.config_server['host'],
                 self.user,
                 self.password,

MongoBackup/Replset.py

@@ -49,8 +49,8 @@ def get_rs_config(self, force=False, quiet=False):
                 raise Exception, "Error getting replica set config! Error: %s" % e, None
         return self.rs_config
 
-    def rs_name(self):
-        return self.get_rs_status['set']
+    def get_rs_name(self):
+        return self.get_rs_status()['set']
 
     def find_primary(self, force=False, quiet=False):
         rs_status = self.get_rs_status(force, quiet)
@@ -70,7 +70,7 @@ def find_primary(self, force=False, quiet=False):
                     str(optime_ts)
                 ))
         if self.primary is None:
-            logging.fatal("Unable to locate a PRIMARY member for replset %s, giving up" % rs_name)
+            logging.error("Unable to locate a PRIMARY member for replset %s, giving up" % rs_name)
             raise Exception, "Unable to locate a PRIMARY member for replset %s, giving up" % rs_name, None
         return self.primary
 
@@ -123,7 +123,7 @@ def find_secondary(self, force=False, quiet=False):
                 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" % (
+            logging.error("Not enough secondaries in replset %s to take backup! Num replset members: %i, required quorum: %i" % (
                 rs_name,
                 secondary_count,
                 quorum_count

MongoBackup/ReplsetSharded.py

@@ -55,6 +55,12 @@ def get_replsets(self, force=False):
                 except Exception, e:
                     logging.fatal("Could not get Replset class object for replset %s! Error: %s" % (shard_name, e))
                     raise e
+
+        configsvr = self.sharding.get_config_server()
+        if configsvr and isinstance(configsvr, Replset):
+            config_rs_name = configsvr.get_rs_name()
+            self.replsets[config_rs_name] = configsvr
+
         return self.replsets
 
     def find_secondaries(self):

MongoBackup/Sharding.py

@@ -16,6 +16,7 @@ def __init__(self, db, user=None, password=None, authdb='admin', balancer_wait_s
         self.balancer_sleep     = balancer_sleep
 
         self.config_server         = None
+        self.config_db             = None
         self._balancer_state_start = None
 
         # Get a DB connection
@@ -31,6 +32,8 @@ def __init__(self, db, user=None, password=None, authdb='admin', balancer_wait_s
             raise e
 
     def close(self):
+        if self.config_db:
+            self.config_db.close()
         return self.restore_balancer_state()
 
     def get_start_state(self):
@@ -98,8 +101,8 @@ def stop_balancer(self):
         logging.fatal("Could not stop balancer: %s:%i!" % (self.host, self.port))
         raise Exception, "Could not stop balancer: %s:%i" % (self.host, self.port), None
 
-    def get_configserver(self, force=False):
-        if force or not self.config_server:
+    def get_configdb_hosts(self):
+        try:
             cmdlineopts = self.db.admin_command("getCmdLineOpts")
             config_string = None
             if cmdlineopts.get('parsed').get('configdb'):
@@ -109,26 +112,33 @@ def get_configserver(self, force=False):
             if config_string:
                 # noinspection PyBroadException
                 try:
-                    config_list = config_string.split(",")
+                    return config_string.split(',')
                 except Exception:
-                    config_list = [config_string]
+                    return [config_string]
+            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
+        except Exception, e:
+            raise e
 
-                db = None
+    def get_config_server(self, force=False):
+        if force or not self.config_server:
+            configdb_hosts = self.get_configdb_hosts()
+            try:
+                config_host, config_port = configdb_hosts[0].split(":")
+                logging.info("Found sharding config server: %s" % (config_host))
+
+                self.config_db = DB(config_host, config_port, self.user, self.password, self.authdb)
+                rs = Replset(self.config_db, self.user, self.password, self.authdb)
                 try:
-                    config_host, config_port = config_list[0].split(":")
-                    db = DB(config_host, config_port, self.user, self.password, self.authdb)
-                    rs = Replset(db, self.user, self.password, self.authdb)
-                    try:
-                        self.config_server = rs.find_secondary(True, True)
-                    except Exception:
-                        self.config_server = {'host': config_list[0], 'replSet': None}
-                except Exception, e:
-                    raise e
+                    rs_status = rs.get_rs_status(False, True)
+                    self.config_server = rs
+                except Exception:
+                    self.config_server = {'host': configdb_hosts[0]}
                 finally:
-                    if db:
-                        db.close()
-
-                logging.debug("Found sharding config server: %s" % (self.config_server['host']))
+                    return self.config_server
+            except Exception, e:
+                raise e
             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