From f29ea9d04a613a39511ce6be3f21aaae428af20d Mon Sep 17 00:00:00 2001
From: Clay Gerrard <clay.gerrard@gmail.com>
Date: Wed, 14 Jul 2021 13:49:50 -0500
Subject: [PATCH] reconciler: concurreny follow-up

Related-Change-Id: I72e9601b58c2f20bb1294876bb39f2c78827d5f8
Change-Id: I21ad3c6377d15e931f737d8bec48ad6c887be52e
---
 swift/container/reconciler.py          | 32 ++++++++++++++------------
 test/unit/container/test_reconciler.py |  7 +++---
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/swift/container/reconciler.py b/swift/container/reconciler.py
index 177bb538d0..0116df6d76 100644
--- a/swift/container/reconciler.py
+++ b/swift/container/reconciler.py
@@ -773,25 +773,19 @@ class ContainerReconciler(Daemon):
                 MISPLACED_OBJECTS_ACCOUNT, container,
                 acceptable_statuses=(2, 404, 409, 412))
 
-    def process_queue_entry(self, container, raw_obj):
+    def process_queue_item(self, q_container, q_entry, queue_item):
         """
         Process an entry and remove from queue on success.
 
-        :param container: the queue container
-        :param raw_obj: the raw_obj listing from the container
+        :param q_container: the queue container
+        :param q_entry: the raw_obj name from the q_container
+        :param queue_item: a parsed entry from the queue
         """
-        try:
-            obj_info = parse_raw_obj(raw_obj)
-        except Exception:
-            self.stats_log('invalid_record',
-                           'invalid queue record: %r', raw_obj,
-                           level=logging.ERROR, exc_info=True)
-            return
-        finished = self.reconcile_object(obj_info)
+        finished = self.reconcile_object(queue_item)
         if finished:
-            self.pop_queue(container, raw_obj['name'],
-                           obj_info['q_ts'],
-                           obj_info['q_record'])
+            self.pop_queue(q_container, q_entry,
+                           queue_item['q_ts'],
+                           queue_item['q_record'])
 
     def reconcile(self):
         """
@@ -805,7 +799,15 @@ class ContainerReconciler(Daemon):
         for container in self._iter_containers():
             self.logger.debug('checking container %s', container)
             for raw_obj in self._iter_objects(container):
-                pool.spawn_n(self.process_queue_entry, container, raw_obj)
+                try:
+                    queue_item = parse_raw_obj(raw_obj)
+                except Exception:
+                    self.stats_log('invalid_record',
+                                   'invalid queue record: %r', raw_obj,
+                                   level=logging.ERROR, exc_info=True)
+                    continue
+                pool.spawn_n(self.process_queue_item,
+                             container, raw_obj['name'], queue_item)
             self.log_stats()
         pool.waitall()
 
diff --git a/test/unit/container/test_reconciler.py b/test/unit/container/test_reconciler.py
index da967abfb2..d62750f272 100644
--- a/test/unit/container/test_reconciler.py
+++ b/test/unit/container/test_reconciler.py
@@ -837,9 +837,10 @@ class TestReconciler(unittest.TestCase):
         def fake_reconcile_object(account, container, obj, q_policy_index,
                                   q_ts, q_op, path, **kwargs):
             order_recieved.append(obj)
-            # o1 takes longer than o2 for some reason
-            while 'o2' not in order_recieved:
-                eventlet.sleep(0.001)
+            if obj == 'o1':
+                # o1 takes longer than o2 for some reason
+                for i in range(10):
+                    eventlet.sleep(0.0)
             return True
 
         self.reconciler._reconcile_object = fake_reconcile_object