Fix some Oplog/TailThread.py exception problems found in testing

Author: timvaillancourt

mongodb_consistent_backup/Common/DB.py

@@ -62,6 +62,7 @@ def client_opts(self):
             if self.do_rp_tags and 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,
@@ -86,7 +87,7 @@ def connect(self):
                 self.uri,
                 self.replset,
                 self.read_pref,
-                self.read_pref_tags,
+                self.do_rp_tags,
                 self.do_ssl(),
             ))
             conn = MongoClient(**self.client_opts())

mongodb_consistent_backup/Oplog/Tailer/TailThread.py

@@ -3,7 +3,7 @@
 
 # noinspection PyPackageRequirements
 from multiprocessing import Process
-from pymongo.errors import AutoReconnect, ConnectionFailure, CursorNotFound, ExceededMaxWaiters, ExecutionTimeout, NetworkTimeout, NotMasterError
+from pymongo.errors import AutoReconnect, ConnectionFailure, CursorNotFound, ExceededMaxWaiters, ExecutionTimeout, NetworkTimeout, NotMasterError, ServerSelectionTimeoutError
 from signal import signal, SIGINT, SIGTERM, SIG_IGN
 from time import sleep, time
 
@@ -144,21 +144,25 @@ def run(self):
                             continue
                     sleep(1)
                 finally:
-                    self._cursor.close()
+                    if self._cursor:
+                        logging.debug("Stopping oplog cursor on %s" % self.uri)
+                        self._cursor.close()
         except OperationError, e:
             logging.error("Tailer %s encountered error: %s" % (self.uri, e))
             self.exit_code = 1
             self.backup_stop.set()
             raise OperationError(e)
+        except ServerSelectionTimeoutError, e:
+            logging.error("Tailer %s could not connect: %s" % (self.uri, e))
+            self.exit_code = 1
+            self.backup_stop.set()
+            raise OperationError(e)
         except Exception, e:
             logging.error("Tailer %s encountered an unexpected error: %s" % (self.uri, e))
             self.exit_code = 1
             self.backup_stop.set()
             raise e
         finally:
-            if self._cursor:
-                logging.debug("Stopping oplog cursor on %s" % self.uri)
-                self._cursor.close()
             oplog.flush()
             oplog.close()
             self.stopped = True