openstack/cloudkitty
Code Issues Proposed changes

Merge "Fix a concurrency issue when locking reprocessing tasks"

Browse Source
This commit is contained in:
Zuul
2023-10-02 15:36:36 +00:00
committed by Gerrit Code Review
parent 52b51b004d 0451df0d1b
commit c3fff2d464
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cloudkitty/orchestrator.py
View File

@@ -614,13 +614,17 @@ class CloudKittyProcessor(cotyledon.Service):
lock_name, lock = get_lock( lock_name, lock = get_lock(
self.coord, self.generate_lock_base_name(tenant_id)) self.coord, self.generate_lock_base_name(tenant_id))
LOG.debug('[Worker: {w}] Trying to acquire lock "{lock_name}".' LOG.debug('[Worker: {w}] Trying to acquire lock "{lock_name}" for '
.format(w=self._worker_id, lock_name=lock_name)) 'scope ID {scope_id}.'.format(w=self._worker_id,
lock_name=lock_name,
scope_id=tenant_id))
lock_acquired = lock.acquire(blocking=False) lock_acquired = lock.acquire(blocking=False)
if lock_acquired: if lock_acquired:
LOG.debug('[Worker: {w}] Acquired lock "{lock_name}".'.format( LOG.debug('[Worker: {w}] Acquired lock "{lock_name}" for '
w=self._worker_id, lock_name=lock_name)) 'scope ID {scope_id}.'.format(w=self._worker_id,
lock_name=lock_name,
scope_id=tenant_id))
try: try:
self.process_scope(tenant_id) self.process_scope(tenant_id)
@@ -702,9 +706,10 @@ class CloudKittyReprocessor(CloudKittyProcessor):
self._worker_id, len(self.tenants)) self._worker_id, len(self.tenants))
def generate_lock_base_name(self, scope): def generate_lock_base_name(self, scope):
return "%s-id=%s-start=%s-end=%s-current=%s" % ( return "%s-id=%s-start=%s-end=%s" % (self.worker_class,
self.worker_class, scope.identifier, scope.start_reprocess_time, scope.identifier,
scope.end_reprocess_time, scope.current_reprocess_time) scope.start_reprocess_time,
scope.end_reprocess_time)
class CloudKittyServiceManager(cotyledon.ServiceManager): class CloudKittyServiceManager(cotyledon.ServiceManager):

5
cloudkitty/tests/test_orchestrator.py
View File

@@ -623,10 +623,9 @@ class CloudKittyReprocessorTest(tests.TestCase):
expected_lock_name = "<class 'cloudkitty.orchestrator." \ expected_lock_name = "<class 'cloudkitty.orchestrator." \
"ReprocessingWorker'>-id=scope_identifier-" \ "ReprocessingWorker'>-id=scope_identifier-" \
"start=%s-end=%s-current=%s" % ( "start=%s-end=%s" % (
scope_mock.start_reprocess_time, scope_mock.start_reprocess_time,
scope_mock.end_reprocess_time, scope_mock.end_reprocess_time)
scope_mock.current_reprocess_time)
self.assertEqual(expected_lock_name, return_generate_lock_name) self.assertEqual(expected_lock_name, return_generate_lock_name)

4
releasenotes/notes/reprocessing-concurrency-issues-2a71f4d86a93c507.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
fixes:
- |
Fixed concurrency issues during reprocessing tasks.