Merge pull request #7157 from Eideticom/martin/br_fetch_sort

process/buildrequestdistributor: sort unclaimed br cache by requestid
buildbot · Nov 7, 2023 · 09a54ab · 09a54ab
2 parents 114c8cc + 9b84a03
commit 09a54ab
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/common/code_spelling_ignore_words.txt b/common/code_spelling_ignore_words.txt
@@ -200,6 +200,7 @@ buildreq
 buildrequest
 buildrequestcompletions
 buildrequestdistributor
+buildrequestid
 buildrequestresults
 buildrequests
 buildrequestsconnectorcomponent

diff --git a/master/buildbot/process/buildrequestdistributor.py b/master/buildbot/process/buildrequestdistributor.py
@@ -87,8 +87,8 @@ def _fetchUnclaimedBrdicts(self):
                                                  [resultspec.Filter('claimed',
                                                                     'eq',
                                                                     [False])])
-            # sort by submitted_at, so the first is the oldest
-            brdicts.sort(key=lambda brd: brd['submitted_at'])
+            # sort by buildrequestid, so the first is the oldest
+            brdicts.sort(key=lambda brd: brd['buildrequestid'])
             self.unclaimedBrdicts = brdicts
         return self.unclaimedBrdicts
 

diff --git a/master/docs/spelling_wordlist.txt b/master/docs/spelling_wordlist.txt
@@ -106,6 +106,7 @@ Buildmaster
 buildmasters
 buildnumber
 buildrequest
+buildrequestid
 buildrequests
 buildset
 Buildset

diff --git a/newsfragments/buildrequest-sort.bugfix b/newsfragments/buildrequest-sort.bugfix
@@ -0,0 +1 @@
+Buildrequests are now selected by priority and then by buildrequestid (previously, we used the age as the secondary sort parameter). This preserves the property of choosing the oldest buildrequest, but makes it predictable which buildrequest will be selected, as there might be multiple buildrequests with the same age.