Sre 2935

.circleci/config.yml

@@ -0,0 +1,61 @@
+# Python CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-python/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
+      - image: objectrocket/circleci-rpm-builder:master
+        auth:
+          username: $DOCKER_USER
+          password: $DOCKER_PASS
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/postgres:9.4
+
+        environment: 
+          PYTHON_BIN: /usr/local/bin/python2.7
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "requirements.txt" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run:
+          name: set version and build the rpm
+          command: |
+            set -x
+            version=$(cat VERSION)
+            echo "${version}.${CIRCLE_BUILD_NUM}" > VERSION
+            make rpm
+
+            git config user.email "dev@objectrocket.com"
+            git config user.name "objectrocketdev"
+            git tag -a $(cat VERSION) -m "Tagged by ${CIRCLE_BUILD_URL}" HEAD
+            rpm -qa | grep ssh
+            rpm -ql libssh2-1.4.2-2.el6_7.1.x86_64
+            git push --tags origin
+
+            mkdir mongodb_consistent_backup_rpm
+            cp /root/repo/build/rpm/RPMS/x86_64/mongodb_consistent_backup-$(cat VERSION)-1.el6.x86_64.rpm mongodb_consistent_backup_rpm/
+
+      - save_cache:
+          paths:
+            - ./venv
+          key: v1-dependencies-{{ checksum "requirements.txt" }}
+
+      - store_artifacts:
+          path: mongodb_consistent_backup_rpm
+          destination: mongodb_consistent_backup
+

mongodb_consistent_backup/Backup/Mongodump/MongodumpThread.py

@@ -224,7 +224,7 @@ def run(self):
             if os.path.isdir(self.dump_dir):
                 rmtree(self.dump_dir)
             os.makedirs(self.dump_dir)
-            logging.debug("Running mongodump cmd: %s" % " ".join(mongodump_cmd))
+            logging.info("Running mongodump cmd: %s" % " ".join(mongodump_cmd))
             self._process = Popen(mongodump_cmd, stdin=PIPE, stderr=PIPE)
             self.wait()
             self.exit_code = self._process.returncode

mongodb_consistent_backup/Common/DB.py

@@ -22,7 +22,7 @@ def parse_read_pref_tags(tags_str):
 
 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):
+                 do_connect=True, conn_timeout=60000, retries=5):
         self.uri            = uri
         self.config         = config
         self.do_replset     = do_replset

mongodb_consistent_backup/Oplog/Resolver/Resolver.py

@@ -148,5 +148,7 @@ def run(self):
             self.stopped = True
 
         for shard in self.resolver_state:
+            logging.info("Getting shard oplog state %s" % (shard))
             self.resolver_summary[shard] = self.resolver_state[shard].get()
+        logging.info("Returning self.resolver_summary")
         return self.resolver_summary

mongodb_consistent_backup/Oplog/Tailer/TailThread.py

@@ -89,7 +89,7 @@ def status(self):
 
     def connect(self):
         if not self.db:
-            self.db = DB(self.uri, self.config, True, 'secondary', True)
+            self.db = DB(self.uri, self.config, False, 'secondary', True)
         return self.db.connection()
 
     def run(self):
@@ -146,7 +146,7 @@ def run(self):
                     sleep(1)
                 finally:
                     if self._cursor:
-                        logging.debug("Stopping oplog cursor on %s" % self.uri)
+                        logging.info("Stopping oplog cursor on %s" % self.uri)
                         self._cursor.close()
         except OperationError, e:
             logging.error("Tailer %s encountered error: %s" % (self.uri, e))
@@ -169,6 +169,7 @@ def run(self):
             self.stopped = True
             self.state.set('running', False)
             self.timer.stop(self.timer_name)
+            logging.info("Thread is stopped and marked as stopped %s" % self.uri)
 
         if self.exit_code == 0:
             log_msg_extra = "%i oplog changes" % self.count

mongodb_consistent_backup/Oplog/Tailer/Tailer.py

@@ -102,8 +102,8 @@ def stop(self, kill=False, sleep_secs=3):
                     logging.warning("Could not get current optime from PRIMARY! Using now as a stop time")
                     timestamp = Timestamp(int(time()), 0)
 
-                # wait for replication to get in sync
-                while state.get('last_ts') and state.get('last_ts') < timestamp:
+                # wait for replication to get in sync making sure cursor has not been stopped in a race condition
+                while state.get('last_ts') and state.get('last_ts') < timestamp and not self.shards[shard]['thread'].stopped:
                     logging.info('Waiting for %s tailer to reach ts: %s, currrent: %s' % (uri, timestamp, state.get('last_ts')))
                     sleep(sleep_secs)
 

scripts/mongodb_consistent_backup.spec

@@ -21,8 +21,8 @@ Prefix:		/usr
 
 # Use CentOS SCL python27 (https://www.softwarecollections.org/en/scls/rhscl/python27/) on CentOS 6 (RHEL6 untested)
 # On build host: 'yum install python27-python python27-python-devel python27-python-virtualenv gcc make libffi-devel openssl-devel'
-%{?el6:Requires: python27-python openssl-libs}
-%{?el6:BuildRequires: python27-python python27-python-devel python27-python-virtualenv gcc make libffi-devel openssl-devel}
+#%{?el6:Requires: openssl-libs}
+%{?el6:BuildRequires: gcc make libffi-devel openssl-devel}
 
 # Use base python/virtualenv, which should be 2.7 on CentOS/RHEL 7
 # On build host: 'yum install python python-devel python-virtualenv gcc make libffi-devel openssl-devel'