From b28383522092c122c4f0f9bac520b83fc89d46e2 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Tue, 19 Mar 2024 12:21:54 -0400
Subject: [PATCH] avoid explicit rowlock in taskWaitCheck

---
 kojihub/kojihub.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/kojihub/kojihub.py b/kojihub/kojihub.py
index b7e6b8f1..d0604843 100644
--- a/kojihub/kojihub.py
+++ b/kojihub/kojihub.py
@@ -14628,8 +14628,7 @@ class Host(object):
         # check to see if any of the tasks have finished
         query = QueryProcessor(tables=['task'], columns=['id', 'state'],
                                clauses=['parent=%(parent)s', 'awaited IS TRUE'],
-                               values={'parent': parent},
-                               opts={'rowlock': True})
+                               values={'parent': parent})
         result = query.execute()
         canceled = koji.TASK_STATES['CANCELED']
         closed = koji.TASK_STATES['CLOSED']
@@ -14648,10 +14647,10 @@ class Host(object):
         finished, unfinished = self.taskWaitCheck(parent)
         # un-await finished tasks
         if finished:
-            context.commit_pending = True
-            for id in finished:
+            finished.sort()  # update in predictable order
+            for task_id in finished:
                 update = UpdateProcessor('task', clauses=['id=%(id)s'],
-                                         values={'id': id}, data={'awaited': False})
+                                         values={'id': task_id}, data={'awaited': False})
                 update.execute()
         return [finished, unfinished]