Merge pull request #55 from timvaillancourt/issue54_config_replset

Issue 54: Remove 'replset/' prefix from config server hostnames

Author: dbmurphy

MongoBackup/Backup.py

@@ -9,7 +9,7 @@
 from time import time
 
 from Archiver import Archiver
-from Common import DB, Lock
+from Common import DB, Lock, validate_hostname
 from Methods import Dumper
 from Notify import NotifyNSCA
 from Oplog import OplogTailer, OplogResolver
@@ -144,6 +144,7 @@ def __init__(self, options):
         #TODO should this be in init or a sub-function?
         # Get a DB connection
         try:
+            validate_hostname(self.host)
             self.db         = DB(self.host, self.port, self.user, self.password, self.authdb)
             self.connection = self.db.connection()
             self.is_sharded = self.connection.is_mongos

MongoBackup/Common/Util.py

@@ -0,0 +1,10 @@
+import socket
+
+
+def validate_hostname(hostname):
+    try:
+        if ":" in hostname:
+            hostname, port = hostname.split(":")
+        socket.gethostbyname(hostname)
+    except socket.error, e:
+        raise Exception, "Could not resolve host '%s', error: %s" % (hostname, e), None

MongoBackup/Common/__init__.py

@@ -1,3 +1,4 @@
 from DB import DB
 from LocalCommand import LocalCommand
 from Lock import Lock
+from Util import validate_hostname

MongoBackup/Replset.py

@@ -2,7 +2,7 @@
 
 from math import ceil
 
-from Common import DB
+from Common import DB, validate_hostname
 
 
 class Replset:
@@ -66,6 +66,7 @@ def find_primary(self, force=False, quiet=False):
                     'host': member['name'],
                     'optime': optime_ts
                 }
+                validate_hostname(self.primary['host'])
                 logging.info("Found PRIMARY: %s/%s with optime %s" % (
                     rs_name,
                     member['name'],
@@ -115,6 +116,7 @@ def find_secondary(self, force=False, quiet=False):
                             'optime': optime_ts,
                             'score': score
                         }
+                        validate_hostname(self.secondary['host'])
                     log_msg = "Found SECONDARY %s/%s" % (rs_name, member['name'])
                 else:
                     log_msg = "Found SECONDARY %s/%s with too-high replication lag! Skipping" % (rs_name, member['name'])

MongoBackup/Sharding.py

@@ -2,7 +2,7 @@
 
 from time import sleep
 
-from Common import DB
+from Common import DB, validate_hostname
 from Replset import Replset
 
 
@@ -112,6 +112,8 @@ def get_configdb_hosts(self):
             if config_string:
                 # noinspection PyBroadException
                 try:
+                    if "/" in config_string:
+                        config_replset, config_string = config_string.split("/")
                     return config_string.split(',')
                 except Exception:
                     return [config_string]
@@ -126,6 +128,7 @@ def get_config_server(self, force=False):
             configdb_hosts = self.get_configdb_hosts()
             try:
                 config_host, config_port = configdb_hosts[0].split(":")
+                validate_hostname(config_host)
                 logging.info("Found sharding config server: %s:%s" % (config_host, config_port))
 
                 self.config_db = DB(config_host, config_port, self.user, self.password, self.authdb)

VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2