Move read_pref string parser to Common/DB.py

Author: timvaillancourt

mongodb_consistent_backup/Backup/Mongodump/MongodumpThread.py

@@ -9,7 +9,7 @@
 from signal import signal, SIGINT, SIGTERM, SIG_IGN
 from subprocess import Popen, PIPE
 
-from mongodb_consistent_backup.Common import is_datetime, parse_config_bool
+from mongodb_consistent_backup.Common import is_datetime, parse_config_bool, parse_read_pref
 from mongodb_consistent_backup.Oplog import Oplog
 
 
@@ -69,16 +69,6 @@ def is_version_gte(self, compare):
                 return True
         return False
 
-    def parse_read_pref(self, mode="secondary"):
-        rp = {"mode": mode}
-        if self.read_pref_tags:
-            rp["tags"] = {}
-            for pair in self.read_pref_tags.replace(" ", "").split(","):
-                if ":" in pair:
-                    key, value = pair.split(":")
-                    rp["tags"][key] = str(value)
-        return json.dumps(rp)
-
     def parse_mongodump_line(self, line):
         try:
             line = line.rstrip()
@@ -159,9 +149,9 @@ def mongodump_cmd(self):
 
         # --readPreference
         if self.is_version_gte("3.2.0"):
-            read_pref = self.parse_read_pref()
+            read_pref = parse_read_pref("secondary", self.read_pref_tags)
             if read_pref:
-                mongodump_flags.append("--readPreference=%s" % read_pref)
+                mongodump_flags.append("--readPreference=%s" % json.dumps(read_pref))
         elif self.read_pref_tags:
             logging.fatal("Mongodump must be >= 3.2.0 to set read preference!")
             sys.exit(1)

mongodb_consistent_backup/Common/DB.py

@@ -11,6 +11,17 @@
 from mongodb_consistent_backup.Errors import DBAuthenticationError, DBConnectionError, DBOperationError, Error
 
 
+def parse_read_pref(mode="secondary", tags_str=None):
+    rp = {"mode": mode}
+    if tags_str:
+        rp["tags"] = {}
+        for pair in tags_str.replace(" ", "").split(","):
+            if ":" in pair:
+                key, value = pair.split(":")
+                rp["tags"][key] = str(value)
+    return rp
+
+
 class DB:
     def __init__(self, uri, config, do_replset=False, read_pref='primaryPreferred', do_rp_tags=False,
                  do_connect=True, conn_timeout=5000, retries=5):
@@ -60,9 +71,9 @@ def client_opts(self):
                 "w":              "majority"
             })
             if self.do_rp_tags and self.read_pref_tags:
+                logging.debug("Using read preference tags: '%s'" % self.read_pref_tags)
                 self.read_pref_tags = self.read_pref_tags.replace(" ", "")
                 opts["readPreferenceTags"] = self.read_pref_tags
-		logging.debug("Using read preference tags: %s" % self.read_pref_tags)
         if self.do_ssl():
             logging.debug("Using SSL-secured mongodb connection (ca_cert=%s, client_cert=%s, crl_file=%s, insecure=%s)" % (
                 self.ssl_ca_file,

mongodb_consistent_backup/Common/__init__.py

@@ -1,5 +1,5 @@
 from Config import Config, parse_config_bool  # NOQA
-from DB import DB  # NOQA
+from DB import DB, parse_read_pref  # NOQA
 from LocalCommand import LocalCommand  # NOQA
 from Lock import Lock  # NOQA
 from MongoUri import MongoUri  # NOQA