Merge pull request #10268 from sbwhitt/fix/merge-authors

Add retry logic to author merge request status update

Author: jimchamp

openlibrary/plugins/upstream/merge_authors.py

@@ -14,6 +14,7 @@
 from openlibrary.plugins.upstream.edits import process_merge_request
 from openlibrary.plugins.worksearch.code import top_books_from_author
 from openlibrary.utils import dicthash, uniq
+from openlibrary.utils.retry import MaxRetriesExceeded, RetryStrategy
 
 
 class BasicRedirectEngine:
@@ -366,9 +367,15 @@ def POST(self):
         comment = data.get('comment', None)
         olids = data.get('olids', '')
 
-        engine = AuthorMergeEngine(AuthorRedirectEngine())
-        try:
-            result = engine.merge(master, duplicates)
+        def merge_records() -> Any:
+            try:
+                engine = AuthorMergeEngine(AuthorRedirectEngine())
+                return engine.merge(master, duplicates)
+            except ClientException as e:
+                raise web.badrequest(json.loads(e.json))
+
+        def update_request() -> None:
+            data = {}
             if mrid:
                 # Update the request
                 rtype = 'update-request'
@@ -380,9 +387,21 @@ def POST(self):
             if comment:
                 data['comment'] = comment
             process_merge_request(rtype, data)
-        except ClientException as e:
-            raise web.badrequest(json.loads(e.json))
-        return delegate.RawText(json.dumps(result), content_type="application/json")
+
+        # actually perform merge and save affected records to db
+        merge_result = merge_records()
+        # attempt to update the merge request status with retries
+        try:
+            RetryStrategy(
+                [ClientException],
+                max_retries=5,
+                delay=2,
+            )(update_request)
+        except MaxRetriesExceeded as e:
+            raise web.badrequest(str(e.last_exception))
+        return delegate.RawText(
+            json.dumps(merge_result), content_type="application/json"
+        )
 
 
 def setup():