updated .close() methods and moved get_configserver to use DB:admin_command

Author: Tim Vaillancourt

MongoBackup/Backup.py

@@ -233,9 +233,8 @@ def run(self):
                     self.balancer_sleep
                 )
                 self.sharding.get_start_state()
-                self.sharding.stop_balancer()
             except Exception, e:
-                self.exception("Problem connecting-to and/or stopping balancer! Error: %s" % e)
+                self.exception("Problem connecting to the balancer! Error: %s" % e)
 
             # get shard secondaries
             try:
@@ -248,10 +247,15 @@ def run(self):
                     self.max_repl_lag_secs
                 )
                 self.secondaries = self.replset.find_secondaries()
-                self.replset.close()
             except Exception, e:
                 self.exception("Problem getting shard secondaries! Error: %s" % e)
 
+            # Stop the balancer:    
+            try:
+                self.sharding.stop_balancer()
+            except Exception, e:
+                self.exception("Problem stopping the balancer! Error: %s" % e)
+
             # start the oplog tailer threads
             if self.no_oplog_tailer:
                 logging.warning("Oplog tailing disabled! Skipping")

MongoBackup/Replset.py

@@ -26,7 +26,7 @@ def __init__(self, db, user, password, authdb, max_lag_secs):
             raise e
 
     def close(self):
-        return self.connection.close()
+        pass
 
     def get_rs_status(self):
         try:
@@ -154,16 +154,15 @@ def find_secondaries(self):
                 shard_name, members = shard['host'].split('/')
                 host, port          = members.split(',')[0].split(":")
 
-                db           = DB(host, port, self.user, self.password, self.authdb) 
-                self.replset = Replset(db, self.user, self.password, self.authdb, self.max_lag_secs)
+                replset_db   = DB(host, port, self.user, self.password, self.authdb) 
+                self.replset = Replset(replset_db, self.user, self.password, self.authdb, self.max_lag_secs)
                 secondary    = self.replset.find_secondary()
                 shard_secondaries[shard_name] = secondary
 
                 self.replset.close()
-                db.close()
+                replset_db.close()
         return shard_secondaries
 
     def close(self):
         if self.replset:
             self.replset.close()
-        self.sharding.close()

MongoBackup/Sharding.py

@@ -27,12 +27,11 @@ def __init__(self, db, user=None, password=None, authdb='admin', balancer_wait_s
             raise e
 
     def close(self):
-        self.restore_balancer_state()
-        return self.connection.close()
+        return self.restore_balancer_state()
 
     def get_start_state(self):
         self._balancer_state_start = self.get_balancer_state()
-        logging.info("Began with balancer state: %s" % str(self._balancer_state_start))
+        logging.info("Began with balancer state running: %s" % str(self._balancer_state_start))
         return self._balancer_state_start
 
     def shards(self):
@@ -96,7 +95,7 @@ def stop_balancer(self):
         raise Exception, "Could not stop balancer: %s:%i" % (self.host, self.port), None
 
     def get_configserver(self):
-        cmdlineopts = self.connection['admin'].command("getCmdLineOpts")
+        cmdlineopts = self.db.admin_command("getCmdLineOpts")
         config_string = None
         if cmdlineopts.get('parsed').get('configdb'):
             config_string = cmdlineopts.get('parsed').get('configdb')