diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-03-16 00:11:17 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-03-16 00:11:17 +0000 |
commit | 0c8ce8ce8fcbafac524a2178a2b8cee29cfeb158 (patch) | |
tree | 58584e0b46a6ec4b4a6b8d1a65bdc24bb63f4d11 /jenkins_jobs/builder.py | |
parent | 101ceff06d7627ce483e72197e5846e83984706c (diff) | |
parent | d1df3359b3c9fd968e8e35c51dc36b0b90ffa216 (diff) | |
download | python-jenkins-job-builder-0c8ce8ce8fcbafac524a2178a2b8cee29cfeb158.tar.gz python-jenkins-job-builder-0c8ce8ce8fcbafac524a2178a2b8cee29cfeb158.tar.xz python-jenkins-job-builder-0c8ce8ce8fcbafac524a2178a2b8cee29cfeb158.zip |
Merge "Allow using lockfile per jenkins master"
Diffstat (limited to 'jenkins_jobs/builder.py')
-rw-r--r-- | jenkins_jobs/builder.py | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/jenkins_jobs/builder.py b/jenkins_jobs/builder.py index 28901b5e..c47a03c7 100644 --- a/jenkins_jobs/builder.py +++ b/jenkins_jobs/builder.py @@ -16,6 +16,7 @@ # Manage jobs in Jenkins server import errno +import fcntl import hashlib import io import logging @@ -47,6 +48,7 @@ class CacheStorage(object): # removed global module references during teardown. _yaml = yaml _logger = logger + _fcntl = fcntl def __init__(self, jenkins_url, flush=False): cache_dir = self.get_cache_dir() @@ -54,6 +56,11 @@ class CacheStorage(object): host_vary = re.sub('[^A-Za-z0-9\-\~]', '_', jenkins_url) self.cachefilename = os.path.join( cache_dir, 'cache-host-jobs-' + host_vary + '.yml') + + # generate named lockfile if not exists, and lock it + while not self._lock(cache_dir, host_vary): + time.sleep(1) + if flush or not os.path.isfile(self.cachefilename): self.data = {} else: @@ -61,6 +68,25 @@ class CacheStorage(object): self.data = yaml.load(yfile) logger.debug("Using cache: '{0}'".format(self.cachefilename)) + def _lock(self, cache_dir, jenkins_master): + path = os.path.join(cache_dir, "lock-jjb.%s" % jenkins_master) + self.lockfile = open(path, 'w') + + try: + self._fcntl.lockf(self.lockfile, + self._fcntl.LOCK_EX | self._fcntl.LOCK_NB) + except IOError: + return False + return True + + def _unlock(self): + if getattr(self, 'lockfile', None) is not None: + try: + self._fcntl.lockf(self.lockfile, self._fcntl.LOCK_UN) + self.lockfile.close() + except IOError: + pass + @staticmethod def get_cache_dir(): home = os.path.expanduser('~') @@ -111,6 +137,7 @@ class CacheStorage(object): self._logger.info("Cache saved") self._logger.debug("Cache written out to '%s'" % self.cachefilename) + self._unlock() def __del__(self): self.save() |