openstack/deb-python-taskflow
Code Issues Proposed changes

Merge "Allow turning off the version check"

Browse Source
This commit is contained in:
Jenkins
2015-02-16 19:25:52 +00:00
committed by Gerrit Code Review
parent 77e6b99afc 35f07aac34
commit 58b5772c8d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
taskflow/jobs/backends/impl_zookeeper.py
View File

@@ -720,7 +720,8 @@ class ZookeeperJobBoard(base.NotifyingJobBoard):
k_exceptions.KazooException) as e:
raise excp.JobFailure("Failed to connect to zookeeper", e)
try:
kazoo_utils.check_compatible(self._client, MIN_ZK_VERSION)
if self._conf.get('check_compatible', True):
kazoo_utils.check_compatible(self._client, MIN_ZK_VERSION)
if self._worker is None and self._emit_notifications:
self._worker = futures.ThreadPoolExecutor(max_workers=1)
self._client.ensure_path(self.path)

8
taskflow/persistence/backends/impl_zookeeper.py
View File

@@ -71,7 +71,7 @@ class ZkBackend(base.Backend):
return self._path
def get_connection(self):
conn = ZkConnection(self, self._client)
conn = ZkConnection(self, self._client, self._conf)
if not self._validated:
conn.validate()
self._validated = True
@@ -88,9 +88,10 @@ class ZkBackend(base.Backend):
class ZkConnection(base.Connection):
def __init__(self, backend, client):
def __init__(self, backend, client, conf):
self._backend = backend
self._client = client
self._conf = conf
self._book_path = paths.join(self._backend.path, "books")
self._flow_path = paths.join(self._backend.path, "flow_details")
self._atom_path = paths.join(self._backend.path, "atom_details")
@@ -101,7 +102,8 @@ class ZkConnection(base.Connection):
def validate(self):
with self._exc_wrapper():
try:
k_utils.check_compatible(self._client, MIN_ZK_VERSION)
if self._conf.get('check_compatible', True):
k_utils.check_compatible(self._client, MIN_ZK_VERSION)
except exc.IncompatibleVersion as e:
raise exc.StorageFailure("Backend storage is not a"
" compatible version", e)