Move replset state to subdir

Author: timvaillancourt

mongodb_consistent_backup/Archive/Tar/TarThread.py

@@ -22,7 +22,7 @@ def close(self, exit_code=None, frame=None):
             del exit_code
             del frame
             self._command.close()
-            self.stopped = False
+            self.stopped = True
 
     def run(self):
         if os.path.isdir(self.backup_dir):

mongodb_consistent_backup/Main.py

@@ -269,8 +269,9 @@ def run(self):
                     self.db
                 )
                 replset_name = self.replset.get_rs_name()
+                replset_dir  = os.path.join(self.backup_directory, replset_name)
                 self.replsets[replset_name] = self.replset
-                state = StateBackupReplset(self.backup_directory, self.config, self.backup_time, replset_name)
+                state = StateBackupReplset(replset_dir, self.config, self.backup_time, replset_name)
                 state.load_state(self.replset.summary())
                 state.write()
             except Exception, e:
@@ -392,7 +393,8 @@ def run(self):
             try:
                 rs_sharded_summary = self.replset_sharded.summary()
                 for shard in rs_sharded_summary:
-                    state = StateBackupReplset(self.backup_directory, self.config, self.backup_time, shard)
+                    shard_dir = os.path.join(self.backup_directory, shard)
+                    state = StateBackupReplset(shard_dir, self.config, self.backup_time, shard)
                     state.load_state(rs_sharded_summary[shard])
                     state.write()
                 self.replset_sharded.close()
@@ -417,7 +419,8 @@ def run(self):
                 self.resolver.compression(self.oplogtailer.compression())
                 resolver_summary = self.resolver.run()
                 for shard in resolver_summary:
-                    state = StateOplog(self.backup_directory, self.config, self.backup_time, shard)
+                    shard_dir = os.path.join(self.backup_directory, shard)
+                    state = StateOplog(shard_dir, self.config, self.backup_time, shard)
                     state.load_state(resolver_summary[shard])
                     state.write()
                 self.resolver.close()

mongodb_consistent_backup/State.py

@@ -73,12 +73,12 @@ def load_state(self, replset):
 
 class StateBackupReplset(StateBaseReplset):
     def __init__(self, base_dir, config, backup_time, set_name):
-        StateBaseReplset.__init__(self, base_dir, config, backup_time, set_name, "set.%s.bson" % set_name)
+        StateBaseReplset.__init__(self, base_dir, config, backup_time, set_name, "replset.bson")
 
 
 class StateOplog(StateBaseReplset):
     def __init__(self, base_dir, config, backup_time, set_name):
-        StateBaseReplset.__init__(self, base_dir, config, backup_time, set_name, "oplog.%s.bson" % set_name)
+        StateBaseReplset.__init__(self, base_dir, config, backup_time, set_name, "oplog.bson")
 
 
 class StateBackup(StateBase):