many changes to support config replset and the rs.status() to determine it

Author: Tim Vaillancourt

MongoBackup/Common/DB.py

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

MongoBackup/Methods/Dumper.py

@@ -20,7 +20,6 @@ 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       = {}
@@ -53,11 +52,11 @@ def run(self):
             self.threads.append(thread)
 
         # backup a single config server:
-        if self.config_server:
+        if self.config_server and self.config_server['is_replset']:
             thread = Dump(
                 self.response_queue,
                 'config',
-                self.config_server,
+                self.config_server['host'],
                 self.user,
                 self.password,
                 self.authdb,

MongoBackup/Replset.py

@@ -28,10 +28,10 @@ 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):
+    def get_rs_status(self, force=False, retry=True, quiet=False):
         try:
             if force or not self.rs_status:
-                self.rs_status = self.db.admin_command('replSetGetStatus', retry)
+                self.rs_status = self.db.admin_command('replSetGetStatus', retry, quiet)
             return self.rs_status
         except Exception, e:
             raise Exception, "Error getting replica set status! Error: %s" % e, None

MongoBackup/Sharding.py

@@ -112,23 +112,22 @@ def get_configserver(self, force=False):
                     config_list = config_string.split(",")
                 except Exception:
                     config_list = [config_string]
-                self.config_server = config_list[0]
+
+                config_replset = False
+                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:
+                        rs.get_rs_status(True, False, True)
+                        config_replset = True
+                    except Exception:
+                        config_replset = False
+                except Exception, e:
+                    raise e             
+
+                self.config_server = {'host': config_list[0], '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
         return self.config_server
-
-    def is_config_replset(self):
-        try:
-            config_server = self.get_configserver()
-            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:
-                rs.get_rs_status(True, False)
-                return 
-            except Exception:
-                return False
-        except Exception, e:
-            raise e             
-