M6 492- separate config folder (#15)

Separate config, admin  folder for each shard

Author: biswazr

VERSION

@@ -1 +1 @@
-1.4.5
+1.4.6

mongodb_consistent_backup/Archive/Tar/TarThread.py

@@ -34,22 +34,26 @@ def run(self):
                     output_file_dir = os.path.dirname(self.output_file)
                     output_file_basename= os.path.basename(self.output_file)
                     admin_backup_file = output_file_dir+"/" +"_".join(["admin",output_file_basename])
+                    config_backup_file = output_file_dir+"/" +"_".join(["config",output_file_basename])
 
                     log_msg   = "Archiving directory: %s" % self.backup_dir
-                    cmd_flags = ["--exclude", "admin" ,"-C", backup_base_dir, "-c", "-f", self.output_file, "--remove-files"]
-                    admin_command_flags = ["-C", self.backup_dir +"/dump/", "-c", "-f", admin_backup_file, "--remove-files"]
+                    cmd_flags = ["--exclude", "admin", "--exclude", "config" ,"-C", backup_base_dir, "-c", "-f", self.output_file, "--remove-files"]
+                    admin_command_flags = ["-C", self.backup_dir +"/dump/", "-c", "-f", admin_backup_file, "--remove-files", "--ignore-failed-read",]
+                    config_command_flags = ["-C", self.backup_dir +"/dump/", "-c", "-f", config_backup_file, "--remove-files", "--ignore-failed-read",]
 
 
                     if self.do_gzip():
                         log_msg = "Archiving and compressing directory: %s" % self.backup_dir
                         cmd_flags.append("-z")
                         admin_command_flags.append("-z")
+                        config_command_flags.append("-z")
 
                     cmd_flags.append(backup_base_name)
                     admin_command_flags.append("admin")
+                    config_command_flags.append("config")
                     logging.info(log_msg)
                     self.running  = True
-                    self._command = LocalCommand(self.binary, cmd_flags, admin_command_flags, self.verbose)
+                    self._command = LocalCommand(self.binary, cmd_flags, admin_command_flags, config_command_flags, self.verbose)
                     self.exit_code = self._command.run()
                 except Exception, e:
                     return self.result(False, "Failed archiving file: %s!" % self.output_file, e)

mongodb_consistent_backup/Common/LocalCommand.py

@@ -7,15 +7,18 @@
 
 
 class LocalCommand:
-    def __init__(self, command, command_flags=None, admin_command_flags=None, verbose=False):
+    def __init__(self, command, command_flags=None, admin_command_flags=None, config_command_flags=None,verbose=False):
         if command_flags is None:
             command_flags = []
         if admin_command_flags is None:
             admin_command_flags = []
+        if config_command_flags is None:
+            config_command_flags = []
         self.command       = command
         self.command_flags = command_flags
         self.admin_command_flags = admin_command_flags
-        self.verbose       = verbose
+        self.config_command_flags = config_command_flags
+        self.verbose = verbose
 
         self.output   = []
         self._process = None
@@ -27,6 +30,10 @@ def __init__(self, command, command_flags=None, admin_command_flags=None, verbos
         self.admin_command_line = [self.command]
         if len(self.admin_command_flags):
             self.admin_command_line.extend(self.admin_command_flags)
+        self.config_command_line = [self.command]
+        if len(self.config_command_flags):
+            self.config_command_line.extend(self.config_command_flags)
+
 
     def parse_output(self):
         if self._process:
@@ -43,7 +50,7 @@ def parse_output(self):
 
     def run(self):
         try:
-            cmd = " ".join(["export GZIP=-1"]+ ["&&"] +self.admin_command_line+ ["&&"]+ self.command_line)
+            cmd = " ".join(["export GZIP=-1" ]+ ["&&"] + self.admin_command_line + ["&&"] + self.config_command_line + ["&&"] + self.command_line)
             self._process = Popen(cmd, stdout=PIPE, stderr=PIPE,shell= True)
             while self._process.poll() is None:
                 self.parse_output()