Merge remote-tracking branch 'upstream/master' into 1.0.3

Author: timvaillancourt

mongodb_consistent_backup/Common/Util.py

@@ -25,6 +25,6 @@ def validate_hostname(hostname):
     try:
         if ":" in hostname:
             hostname, port = hostname.split(":")
-        socket.gethostbyname(hostname)
+        socket.getaddrinfo(hostname, None)
     except socket.error, e:
         raise OperationError("Could not resolve host '%s', error: %s" % (hostname, e))

mongodb_consistent_backup/Oplog/Tailer/TailThread.py

@@ -3,6 +3,7 @@
 
 # Skip bson in requirements , pymongo provides
 # noinspection PyPackageRequirements
+from bson.codec_options import CodecOptions
 from multiprocessing import Process
 from pymongo import CursorType
 from pymongo.errors import AutoReconnect
@@ -67,13 +68,14 @@ def run(self):
         self.conn = DB(self.uri, self.config, True, 'secondary').connection()
         db        = self.conn['local']
         oplog     = self.oplog()
+        oplog_rs  = db.oplog.rs.with_options(codec_options=CodecOptions(unicode_decode_error_handler="ignore"))
 
-        tail_start_ts = db.oplog.rs.find().sort('$natural', -1)[0]['ts']
+        tail_start_ts = oplog_rs.find().sort('$natural', -1)[0]['ts']
         self.state.set('running', True)
         while not self.do_stop.is_set():
             # http://api.mongodb.com/python/current/examples/tailable.html
             query  = {'ts':{'$gt':tail_start_ts}}
-            cursor = db.oplog.rs.find(query, cursor_type=CursorType.TAILABLE_AWAIT, oplog_replay=True)
+            cursor = oplog_rs.find(query, cursor_type=CursorType.TAILABLE_AWAIT, oplog_replay=True)
             try:
                 while not self.do_stop.is_set():
                     try: