Rename of conf file, port fix for Nsca, etc

Author: timvaillancourt

Makefile

@@ -18,7 +18,7 @@ install: bin/mongodb-consistent-backup
 	rm -rf bin build 2>/dev/null
 	mkdir -p $(BINDIR) $(SHAREDIR)/$(NAME) || true
 	install -m 0755 bin/mongodb-consistent-backup $(BINDIR)/mongodb-consistent-backup
-	install -m 0644 conf/mongodb-consistent-backup.example.yml $(SHAREDIR)/$(NAME)/example.yml
+	install -m 0644 conf/mongodb-consistent-backup.example.conf $(SHAREDIR)/$(NAME)/example.conf
 	install -m 0644 LICENSE $(SHAREDIR)/$(NAME)/LICENSE
 	install -m 0644 README.rst $(SHAREDIR)/$(NAME)/README.rst
 
@@ -31,7 +31,7 @@ rpm: bin/mongodb-consistent-backup
 	mkdir -p build/rpm/SOURCES
 	cp -f $(PWD)/{LICENSE,README.rst} build/rpm/SOURCES
 	cp -f $(PWD)/bin/mongodb-consistent-backup build/rpm/SOURCES/mongodb-consistent-backup
-	cp -f $(PWD)/conf/mongodb-consistent-backup.example.yml build/rpm/SOURCES/mongodb-consistent-backup.yml
+	cp -f $(PWD)/conf/mongodb-consistent-backup.example.conf build/rpm/SOURCES/mongodb-consistent-backup.conf
 	rpmbuild -D "_topdir $(PWD)/build/rpm" -D "version $(VERSION)" -bb scripts/$(NAME).spec
 
 docker:

README.rst

@@ -53,7 +53,7 @@ command):
 
 ::
 
-    yum install python python-devel python-virtualenv gcc make libffi-devel openssl-devel
+    yum install python python-devel python-virtualenv gcc git make libffi-devel openssl-devel
 
 To install to default '*/usr/local/bin/mongodb-consistent-backup*\ ':
 

conf/mongodb-consistent-backup.example.yml renamed to conf/mongodb-consistent-backup.example.conf

@@ -58,7 +58,7 @@ def makeParser(self):
         parser.add_argument("-l", "--backup.location", dest="backup.location", help="Base path to store the backup data (required)", type=str)
         parser.add_argument("-m", "--backup.method", dest="backup.method", help="Method to be used for backup (default: mongodump)", default='mongodump', choices=['mongodump'])
         parser.add_argument("-L", "--log-dir", dest="log_dir", help="Path to write log files to (default: disabled)", default='', type=str)
-        parser.add_argument("--lock-file", dest="lock_file", help="Location of lock file (default: /tmp/mongodb_consistent_backup.lock)", default='/tmp/mongodb_consistent_backup.lock', type=str)
+        parser.add_argument("--lock-file", dest="lock_file", help="Location of lock file (default: /tmp/mongodb-consistent-backup.lock)", default='/tmp/mongodb-consistent-backup.lock', type=str)
         parser.add_argument("--sharding.balancer.wait_secs", dest="sharding.balancer.wait_secs", help="Maximum time to wait for balancer to stop, in seconds (default: 300)", default=300, type=int)
         parser.add_argument("--sharding.balancer.ping_secs", dest="sharding.balancer.ping_secs", help="Interval to check balancer state, in seconds (default: 3)", default=3, type=int)
         return self.makeParserLoadSubmodules(parser)

mongodb_consistent_backup/Common/Config.py

@@ -44,7 +44,7 @@ def __init__(self, prog_name="mongodb-consistent-backup"):
         self.backup_summary           = {}
         self.manager                  = Manager()
         self.timer                    = Timer(self.manager)
-        self.timer_name               = "mongodb_consistent_backup.%s" % self.__class__.__name__
+        self.timer_name               = "%s.%s" % (self.program_name, self.__class__.__name__)
         self.backup_time              = datetime.now().strftime("%Y%m%d_%H%M")
         self.logger                   = None
         self.current_log_file         = None

mongodb_consistent_backup/Main.py

@@ -34,7 +34,8 @@ def __init__(self, manager, config, timer, base_dir, backup_dir, **kwargs):
         self.server_name = self.server
         self.server_port = 5667
         if ':' in self.server:
-            self.server_name, self.server_port = self.server.split(":")
+            self.server_name, port = self.server.split(":")
+            self.server_port = int(port)
         self.server = "%s:%i" % (self.server_name, self.server_port)
 
         try:

mongodb_consistent_backup/Notify/Nsca/Nsca.py

@@ -1,7 +1,5 @@
 import logging
 import os
-import sys
-
 # Skip bson in requirements , pymongo provides
 # noinspection PyPackageRequirements
 from bson import decode_file_iter
@@ -25,7 +23,7 @@ def cleanup(self):
         if 'tailed' in self.oplogs:
             self.oplogs['tailed'].close()
             del self.oplogs['tailed']
-        if 'file' in self.tailed_opplog and os.path.isfile(self.tailed_oplog['file']):
+        if 'file' in self.tailed_oplog and os.path.isfile(self.tailed_oplog['file']):
             os.remove(self.tailed_oplog['file'])
 
     def run(self):
@@ -58,7 +56,6 @@ def run(self):
 
         if self.exit_code == 0:
             logging.info("Applied %i oplog changes to %s oplog, end ts: %s" % (self.changes, self.uri, self.mongodump_oplog_h.last_ts()))
-        sys.exit(self.exit_code)
 
     def close(self):
         self.cleanup()

mongodb_consistent_backup/Oplog/Resolver/ResolverThread.py

@@ -94,14 +94,18 @@ if [ -d ${srcdir} ]; then
 		exit 1
 	fi
 
-	# Get git HEAD of yconf
-	if [ -d ${tmpdir}/yconf ]; then
-	    pushd ${tmpdir}/yconf
-	    git pull
-	    popd
-	else
-	    git clone https://github.com/kampka/yconf ${tmpdir}/yconf
+	# Get git commit 229a8280c43eaad71085361e5a5e13a20a3d37ea of yconf until 0.3.4 is released
+	# When is 0.3.4 is released, delete this block and add 'yconf==0.3.4' to requirements.txt,
+	# also remove yconf path from pex command at line 116.
+	yconf_github=https://github.com/kampka/yconf
+	yconf_commit=229a8280c43eaad71085361e5a5e13a20a3d37ea
+	if [ ! -d ${tmpdir}/yconf ]; then
+		git clone ${yconf_github} ${tmpdir}/yconf
 	fi
+	pushd ${tmpdir}/yconf
+	git reset --hard ${yconf_commit}
+	popd
+	# End of yconf block
 
 	if [ ! -d ${pexdir} ]; then
 		mkdir -p ${pexdir}

scripts/build.sh

@@ -14,7 +14,7 @@ Group:		Software/Database
 License:	Apache License Version 2.0
 URL:		https://github.com/Percona-Lab/mongodb_consistent_backup
 Source0:	%{bin_name}
-Source1:	%{bin_name}.yml
+Source1:	%{bin_name}.conf
 Source2:	LICENSE
 Source3:	README.rst
 Prefix:		/usr