openstack/deb-python-taskflow
Code Issues Proposed changes

Translate kazoo exceptions into job equivalents if register_entity fails

Browse Source 
Change-Id: I8c0abef6924f16c8b017193451e1ee273ad1d754
This commit is contained in:
Joshua Harlow
2015-12-14 17:55:56 -08:00
committed by Thomas Goirand
parent 1ba18d81ad
commit 1c95f2e1d1
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,7 +404,6 @@ class ZookeeperJobBoard(base.NotifyingJobBoard):
# Skip lock paths or non-job-paths (these are not valid jobs) # Skip lock paths or non-job-paths (these are not valid jobs)
continue continue
child_paths.append(k_paths.join(self.path, c)) child_paths.append(k_paths.join(self.path, c))
# Figure out what we really should be investigating and what we # Figure out what we really should be investigating and what we
# shouldn't (remove jobs that exist in our local version, but don't # shouldn't (remove jobs that exist in our local version, but don't
# exist in the children anymore) and accumulate all paths that we # exist in the children anymore) and accumulate all paths that we
@@ -569,14 +568,29 @@ class ZookeeperJobBoard(base.NotifyingJobBoard):
entity_type = entity.kind entity_type = entity.kind
if entity_type == c_base.Conductor.ENTITY_KIND: if entity_type == c_base.Conductor.ENTITY_KIND:
entity_path = k_paths.join(self.entity_path, entity_type) entity_path = k_paths.join(self.entity_path, entity_type)
self._client.ensure_path(entity_path) try:
self._client.ensure_path(entity_path)
conductor_name = entity.name self._client.create(k_paths.join(entity_path, entity.name),
self._client.create(k_paths.join(entity_path, value=misc.binary_encode(
conductor_name), jsonutils.dumps(entity.to_dict())),
value=misc.binary_encode( ephemeral=True)
jsonutils.dumps(entity.to_dict())), except k_exceptions.NodeExistsError:
ephemeral=True) pass
except self._client.handler.timeout_exception:
excp.raise_with_cause(
excp.JobFailure,
"Can not register entity %s under %s, operation"
" timed out" % (entity.name, entity_path))
except k_exceptions.SessionExpiredError:
excp.raise_with_cause(
excp.JobFailure,
"Can not register entity %s under %s, session"
" expired" % (entity.name, entity_path))
except k_exceptions.KazooException:
excp.raise_with_cause(
excp.JobFailure,
"Can not register entity %s under %s, internal"
" error" % (entity.name, entity_path))
else: else:
raise excp.NotImplementedError( raise excp.NotImplementedError(
"Not implemented for other entity type '%s'" % entity_type) "Not implemented for other entity type '%s'" % entity_type)