Merge pull request #5509 from p12tic/2.8-changes

2.8: Fix bad fieldMapping in change data endpoint
buildbot · Aug 29, 2020 · 4a656cd · 4a656cd
2 parents fc96083 + c660f50
commit 4a656cd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/master/buildbot/data/changes.py b/master/buildbot/data/changes.py
@@ -41,7 +41,7 @@ def _fixChange(self, change):
             del change['sourcestampid']
         return change
     fieldMapping = {
-        'changeid': 'changes.id',
+        'changeid': 'changes.changeid',
     }
 
 

diff --git a/master/buildbot/newsfragments/datachanges.bugfix b/master/buildbot/newsfragments/datachanges.bugfix
@@ -0,0 +1 @@
+fix 100% CPU on large installs when looking using the changes api (:issue:`5504`)
diff --git a/master/buildbot/test/unit/test_db_changes.py b/master/buildbot/test/unit/test_db_changes.py
@@ -19,6 +19,7 @@
 from twisted.trial import unittest
 
 from buildbot.data import resultspec
+from buildbot.data.changes import FixerMixin
 from buildbot.db import builds
 from buildbot.db import changes
 from buildbot.db import sourcestamps
@@ -277,7 +278,7 @@ def insert7Changes(self):
     def test_getChanges_subset(self):
         yield self.insert7Changes()
         rs = resultspec.ResultSpec(order=['-changeid'], limit=5)
-        rs.fieldMapping = {'changeid': 'changes.changeid'}
+        rs.fieldMapping = FixerMixin.fieldMapping
         changes = yield self.db.changes.getChanges(resultSpec=rs)
         changeids = [c['changeid'] for c in changes]
         self.assertEqual(changeids, [10, 11, 12, 13, 14])