check again

Author: biswazr

mongodb_consistent_backup/Backup/Mongodump/MongodumpThread.py

@@ -3,7 +3,7 @@
 import logging
 import sys
 from distutils.version import LooseVersion
-import urllib
+
 from multiprocessing import Process
 from select import select
 from shutil import rmtree
@@ -144,40 +144,6 @@ def wait(self):
         finally:
             self._process.communicate()
 
-    def auth_db_insert(self, mongodump_flags,auth_details=dict()):
-        # --username/--password/--authdb
-            if self.is_version_gte("4.2.0"):
-                if self.authdb and self.authdb != "admin":
-                    logging.debug("Using database %s for authentication" % self.authdb)
-                    auth_details['authdb']=self.authdb
-                else:
-                    auth_details['authdb']="admin"
-                if self.user and self.password:
-                # >= 3.0.2 supports password input via stdin to mask from ps
-                    auth_details['user']=urllib.quote_plus(self.user)
-                    auth_details['password']=urllib.quote_plus(self.password)
-                return auth_details
-            elif self.is_version_gte("3.0.2"):
-                if self.authdb and self.authdb != "admin":
-                    mongodump_flags.append("--authenticationDatabase=%s" % self.authdb)
-                if self.user and self.password:
-                    mongodump_flags.extend([
-                        "--username=%s" % self.user,
-                        "--password=\"\""
-                    ])
-                    self.do_stdin_passwd = True
-                return mongodump_flags
-            else:
-                if self.authdb and self.authdb != "admin":
-                    mongodump_flags.append("--authenticationDatabase=%s" % self.authdb)
-                if self.user and self.password:
-                    logging.warning("Mongodump is too old to set password securely! Upgrade to mongodump >= 3.0.2 to resolve this")
-                    mongodump_flags.extend([
-                        "--username=%s" % self.user,
-                        "--password=%s" % self.password
-                    ])
-                return mongodump_flags
-
     def mongodump_cmd(self):
         mongodump_uri   = self.uri.get()
         mongodump_cmd   = [self.binary]
@@ -189,21 +155,12 @@ def mongodump_cmd(self):
                 logging.fatal("Mongodump must be >= 3.6.0 to use mongodb+srv:// URIs")
                 sys.exit(1)
             mongodump_flags.append("--host=%s" % self.uri.url)
-        ## TODO we can support compress with srv too ,but as of 22feb we donot require the feature can be a point for improvement
-        elif self.is_version_gte("4.2.0"):
-            mongo_url_port=":".join([mongodump_uri.host ,str(mongodump_uri.port)])
-            auth_details=self.auth_db_insert(mongodump_flags)
-            parsed_uri = 'mongodb://%s:%s@%s/?authSource=%s&compressors=snappy,zlib,zstd&readPreference=secondary' % (urllib.quote_plus(auth_details['user']), urllib.quote_plus(auth_details['password']), mongo_url_port, auth_details['authdb'])
-            mongodump_flags.extend([
-            "--uri=%s" % parsed_uri,
-            ])
         else:
             mongodump_flags.extend([
                 "--host=%s" % mongodump_uri.host,
                 "--port=%s" % str(mongodump_uri.port)
             ])
 
-        
         if self.oplog_enabled_parse():
           mongodump_flags.extend([
               "--oplog"
@@ -212,11 +169,11 @@ def mongodump_cmd(self):
         mongodump_flags.extend([
             "--out=%s/dump" % self.backup_dir
         ])
-        #if self.is_version_gte("4.2.0"):
-        #    logging.info("MongoDump Version higher that 4.2.0 found extendingmongodump with snappy compressor flag")
-        #    mongodump_flags.extend([
-        #        "--compressor=%s" % "snappy"
-        #    ])
+        if self.is_version_gte("4.2.0"):
+            logging.info("MongoDump Version higher that 4.2.0 found extendingmongodump with snppy compressor flag")
+            mongodump_flags.extend([
+                "--compressors=%s" % "snappy"
+            ])
 
         # --numParallelCollections
         if self.threads > 0:
@@ -235,11 +192,24 @@ def mongodump_cmd(self):
             logging.fatal("Mongodump must be >= 3.2.0 to set read preference!")
             sys.exit(1)
 
-        if not self.is_version_gte("4.2.0"):
-            # this will add auth to non srv url and which are above 4.2.0
-            mongodump_flags=self.auth_db_insert(mongodump_flags)
-
-
+        # --username/--password/--authdb
+        if self.authdb and self.authdb != "admin":
+            logging.debug("Using database %s for authentication" % self.authdb)
+            mongodump_flags.append("--authenticationDatabase=%s" % self.authdb)
+        if self.user and self.password:
+            # >= 3.0.2 supports password input via stdin to mask from ps
+            if self.is_version_gte("3.0.2"):
+                mongodump_flags.extend([
+                    "--username=%s" % self.user,
+                    "--password=\"\""
+                ])
+                self.do_stdin_passwd = True
+            else:
+                logging.warning("Mongodump is too old to set password securely! Upgrade to mongodump >= 3.0.2 to resolve this")
+                mongodump_flags.extend([
+                    "--username=%s" % self.user,
+                    "--password=%s" % self.password
+                ])
 
         # --ssl
         if self.do_ssl():
@@ -260,7 +230,7 @@ def mongodump_cmd(self):
         mongodump_cmd.extend(mongodump_flags)
         logging.info("-----mongodump_cmd: %s" % mongodump_cmd)
         return mongodump_cmd
-    
+
     def run(self):
         logging.info("Starting mongodump backup of %s" % self.uri)