some more cleanup

Author: Tim Vaillancourt

MongoBackup/Common/DB.py

@@ -44,7 +44,7 @@ def auth_if_required(self):
         else:
             pass
 
-    def admin_command(self, admin_command, retry=True, quiet=False):
+    def admin_command(self, admin_command, quiet=False):
         tries  = 0
         status = None
         while not status and tries < self.retries:
@@ -53,8 +53,6 @@ def admin_command(self, admin_command, retry=True, quiet=False):
                 if not status:
                     raise e
             except Exception, e:
-                if not retry:
-                    tries = self.retries
                 if not quiet:
                     logging.error("Error running admin command '%s': %s" % (admin_command, e))
                 tries += 1

MongoBackup/Methods/Dumper.py

@@ -52,7 +52,7 @@ def run(self):
             self.threads.append(thread)
 
         # backup a single config server:
-        if self.config_server and self.config_server['is_replset']:
+        if self.config_server and self.config_server['replset']:
             thread = Dump(
                 self.response_queue,
                 'config',

MongoBackup/Replset.py

@@ -28,24 +28,27 @@ def __init__(self, db, user=None, password=None, authdb='admin', max_lag_secs=5)
     def close(self):
         pass
 
-    def get_rs_status(self, force=False, retry=True, quiet=False):
+    def get_rs_status(self, force=False, quiet=False):
         try:
             if force or not self.rs_status:
-                self.rs_status = self.db.admin_command('replSetGetStatus', retry, quiet)
+                self.rs_status = self.db.admin_command('replSetGetStatus', quiet)
             return self.rs_status
         except Exception, e:
             raise Exception, "Error getting replica set status! Error: %s" % e, None
 
-    def get_rs_config(self, retry=True):
+    def get_rs_config(self, quiet=False):
         try:
             if self.db.server_version() >= tuple("3.0.0".split(".")):
-                output = self.db.admin_command('replSetGetConfig', retry)
+                output = self.db.admin_command('replSetGetConfig', quiet)
                 return output['config']
             else:
                 return self.connection['local'].system.replset.find_one()
         except Exception, e:
             raise Exception, "Error getting replica set config! Error: %s" % e, None
 
+    def rs_name(self):
+        return self.get_rs_status['set']
+
     def find_primary(self, force=False):
         rs_status = self.get_rs_status(force)
         rs_name   = rs_status['set']

MongoBackup/Sharding.py

@@ -113,24 +113,22 @@ def get_configserver(self, force=False):
                 except Exception:
                     config_list = [config_string]
 
-                config_server  = config_list[0]
-                config_replset = False
+                db = None
                 try:
-                    config_host, config_port = config_server.split(":")
+                    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:
-                        rs.get_rs_status(True, False, True)
-                        config_replset = True
+                        self.config_server = rs.find_secondary()
                     except Exception:
-                        config_replset = False
+                        self.config_server = {'host': config_list[0], 'replSet': None}
                 except Exception, e:
-                    raise e             
+                    raise e
+                finally:
+                    if db:
+                        db.close()
 
-                if config_replset:
-                    config_server = rs.find_secondary()
-
-                self.config_server = {'host': config_server, 'is_replset': config_replset}
+                logging.debug("Found sharding config server: %s" % (self.config_server['host']))
             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