From 494816f8cf31269e27ac8c75d71d1dc923609c67 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Fri, 20 Nov 2026 17:06:33 +0000 Subject: [PATCH 1/2] Set a timeout for release branch metadata requests --- .github/workflows/check.yml | 2 ++ master/custom/release_dashboard.py | 2 +- tests/test_release_dashboard_branch_timeout.py | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 tests/test_release_dashboard_branch_timeout.py diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index bf07b26d..54958922 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -26,6 +26,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Check configuration run: make check PIP=pip BUILDBOT=buildbot PYTHON_VERSION=${{ matrix.python-version }} + - name: Check custom components + run: PYTHONPATH=master python -m unittest discover -s tests - name: Compare configuration reports run: | # Use the same formatter for both configurations, including older main revisions. diff --git a/master/custom/release_dashboard.py b/master/custom/release_dashboard.py index 3f0c024d..fcc9f2a9 100644 --- a/master/custom/release_dashboard.py +++ b/master/custom/release_dashboard.py @@ -791,7 +791,7 @@ def short_rm_name(full_name): return full_name.split()[0] def _refresh_branch_info(self): - with urllib.request.urlopen(BRANCHES_URL) as file: + with urllib.request.urlopen(BRANCHES_URL, timeout=10) as file: self.branch_info = json.load(file) def get_release_status(self): diff --git a/tests/test_release_dashboard_branch_timeout.py b/tests/test_release_dashboard_branch_timeout.py new file mode 100644 index 00000000..118c88bb --- /dev/null +++ b/tests/test_release_dashboard_branch_timeout.py @@ -0,0 +1,14 @@ +import json +import unittest +from unittest import mock + +from custom import release_dashboard as dashboard + + +class BranchRequestTests(unittest.TestCase): + def test_branch_request_has_timeout(self): + page = object.__new__(dashboard.ReleaseDashboard) + with mock.patch.object(dashboard.urllib.request, 'urlopen') as urlopen: + urlopen.return_value.__enter__.return_value.read.return_value = json.dumps({}) + page._refresh_branch_info() + urlopen.assert_called_once_with(dashboard.BRANCHES_URL, timeout=10) From 9d85a366bd8755e51b1a550e03da64195492a3f8 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Fri, 20 Nov 2026 18:27:00 +0000 Subject: [PATCH 2/2] Handle release metadata timeouts --- .github/workflows/check.yml | 2 -- master/custom/release_dashboard.py | 13 +++++++++---- tests/test_release_dashboard_branch_timeout.py | 14 -------------- 3 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 tests/test_release_dashboard_branch_timeout.py diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 54958922..bf07b26d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -26,8 +26,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: Check configuration run: make check PIP=pip BUILDBOT=buildbot PYTHON_VERSION=${{ matrix.python-version }} - - name: Check custom components - run: PYTHONPATH=master python -m unittest discover -s tests - name: Compare configuration reports run: | # Use the same formatter for both configurations, including older main revisions. diff --git a/master/custom/release_dashboard.py b/master/custom/release_dashboard.py index fcc9f2a9..3050b618 100644 --- a/master/custom/release_dashboard.py +++ b/master/custom/release_dashboard.py @@ -20,6 +20,7 @@ from buildbot.data.resultspec import Filter import buildbot.process.results +from werkzeug.exceptions import ServiceUnavailable N_BUILDS = 200 MAX_CHANGES = 50 @@ -739,8 +740,7 @@ class ReleaseDashboard: def __init__(self, test_result_dir=None): self.flask_app = Flask("test", root_path=os.path.dirname(__file__)) self.cache = None - - self._refresh_branch_info() + self.branch_info = {} self.flask_app.jinja_env.add_extension('jinja2.ext.loopcontrols') self.flask_app.jinja_env.undefined = jinja2.StrictUndefined @@ -791,8 +791,13 @@ def short_rm_name(full_name): return full_name.split()[0] def _refresh_branch_info(self): - with urllib.request.urlopen(BRANCHES_URL, timeout=10) as file: - self.branch_info = json.load(file) + try: + with urllib.request.urlopen(BRANCHES_URL, timeout=2) as file: + self.branch_info = json.load(file) + except (OSError, ValueError): + self.flask_app.logger.warning('Could not refresh release branch data', exc_info=True) + if not self.branch_info: + raise ServiceUnavailable('Release branch data is not yet available.', retry_after=5) def get_release_status(self): state = DashboardState(self) diff --git a/tests/test_release_dashboard_branch_timeout.py b/tests/test_release_dashboard_branch_timeout.py deleted file mode 100644 index 118c88bb..00000000 --- a/tests/test_release_dashboard_branch_timeout.py +++ /dev/null @@ -1,14 +0,0 @@ -import json -import unittest -from unittest import mock - -from custom import release_dashboard as dashboard - - -class BranchRequestTests(unittest.TestCase): - def test_branch_request_has_timeout(self): - page = object.__new__(dashboard.ReleaseDashboard) - with mock.patch.object(dashboard.urllib.request, 'urlopen') as urlopen: - urlopen.return_value.__enter__.return_value.read.return_value = json.dumps({}) - page._refresh_branch_info() - urlopen.assert_called_once_with(dashboard.BRANCHES_URL, timeout=10)