Improved logging + balancer stop timer

Author: timvaillancourt

Diff for: mongodb_consistent_backup/Oplog/Resolver/Resolver.py

@@ -67,10 +67,10 @@ def get_consistent_end_ts(self):
         return ts
 
     def run(self):
-        logging.info("Resolving oplogs using %i threads max" % self.threads())
+	logging.info("Resolving oplogs (options: threads=%s,compression=%s)" % (self.threads(), self.compression()))
         self.timer.start()
 
-        self.end_ts   = self.get_consistent_end_ts()
+        self.end_ts = self.get_consistent_end_ts()
         for host in self.backup_oplogs:
             for port in self.backup_oplogs[host]:
                 backup_oplog = self.backup_oplogs[host][port]

Diff for: mongodb_consistent_backup/Sharding.py

@@ -2,7 +2,7 @@
 
 from time import sleep
 
-from Common import DB, validate_hostname
+from mongodb_consistent_backup.Common import DB, Timer, validate_hostname
 from mongodb_consistent_backup.Replication import Replset
 
 
@@ -89,15 +89,17 @@ def restore_balancer_state(self):
     def stop_balancer(self):
         logging.info("Stopping the balancer and waiting a max of %i sec" % self.balancer_wait_secs)
         wait_cnt = 0
+	stop_timer = Timer()
+	stop_timer.start()
         self.set_balancer(False)
         while wait_cnt < self.balancer_wait_secs:
             if self.check_balancer_running():
                 wait_cnt += self.balancer_sleep
                 logging.info("Balancer is still running, sleeping for %i sec(s)" % self.balancer_sleep)
                 sleep(self.balancer_sleep)
             else:
-                sleep(self.balancer_sleep)
-                logging.info("Balancer is now stopped")
+		stop_timer.stop()
+                logging.info("Balancer stopped after %s seconds" % stop_timer.duration())
                 return
         logging.fatal("Could not stop balancer: %s:%i!" % (self.db.host, self.db.port))
         raise Exception, "Could not stop balancer: %s:%i" % (self.db.host, self.db.port), None