openstack/cloudkitty
Code Issues Proposed changes

Merge "Don't heartbeat manually in the cloudkitty orchestrator"

Browse Source
This commit is contained in:
Zuul
2018-11-20 17:41:54 +00:00
committed by Gerrit Code Review
parent 828cf6ff9d 641b501699
commit 7ef878ea34
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cloudkitty/orchestrator.py
View File

@@ -258,7 +258,7 @@ class Orchestrator(object):
self.coord = coordination.get_coordinator( self.coord = coordination.get_coordinator(
CONF.orchestrator.coordination_url, CONF.orchestrator.coordination_url,
uuidutils.generate_uuid().encode('ascii')) uuidutils.generate_uuid().encode('ascii'))
self.coord.start() self.coord.start(start_heart=True)
def _lock(self, tenant_id): def _lock(self, tenant_id):
lock_name = b"cloudkitty-" + str(tenant_id).encode('ascii') lock_name = b"cloudkitty-" + str(tenant_id).encode('ascii')
@@ -308,7 +308,6 @@ class Orchestrator(object):
lock.release() lock.release()
self.coord.heartbeat()
# NOTE(sheeprine): Slow down looping if all tenants are # NOTE(sheeprine): Slow down looping if all tenants are
# being processed # being processed
eventlet.sleep(1) eventlet.sleep(1)

5
releasenotes/notes/fix-lock-release-74d112c8599c9a59.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
fixes:
- |
cloudkitty-processor crashes which happened when using distributed
tooz locks have been fixed.