From 031e9d79adc90e81e3cf46723c9b9d7db94b4ece Mon Sep 17 00:00:00 2001 From: fjetter Date: Tue, 19 Dec 2023 11:55:17 +0100 Subject: [PATCH 1/2] Do not run gilknocker in testsuite --- distributed/utils_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/distributed/utils_test.py b/distributed/utils_test.py index 37df9ba57a..9c167d0412 100644 --- a/distributed/utils_test.py +++ b/distributed/utils_test.py @@ -1814,6 +1814,7 @@ def config_for_cluster_tests(**extra_config): "distributed.scheduler.validate": True, "distributed.worker.validate": True, "distributed.worker.profile.enabled": False, + "distributed.admin.system-monitor.gil.enabled": False, }, **extra_config, ): From 7d671ab152ebdf312b4e4c1bca9a92bc8a4b9a5a Mon Sep 17 00:00:00 2001 From: fjetter Date: Tue, 19 Dec 2023 13:39:26 +0100 Subject: [PATCH 2/2] fix tests --- distributed/http/scheduler/tests/test_scheduler_http.py | 8 +++++++- distributed/http/worker/tests/test_worker_http.py | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/distributed/http/scheduler/tests/test_scheduler_http.py b/distributed/http/scheduler/tests/test_scheduler_http.py index 1718d5893e..d51ddf33ea 100644 --- a/distributed/http/scheduler/tests/test_scheduler_http.py +++ b/distributed/http/scheduler/tests/test_scheduler_http.py @@ -98,7 +98,13 @@ async def test_prefix(c, s, a, b): assert is_valid_xml(body) -@gen_cluster(client=True, clean_kwargs={"threads": False}) +@gen_cluster( + client=True, + clean_kwargs={"threads": False}, + config={ + "distributed.admin.system-monitor.gil.enabled": True, + }, +) async def test_prometheus(c, s, a, b): pytest.importorskip("prometheus_client") diff --git a/distributed/http/worker/tests/test_worker_http.py b/distributed/http/worker/tests/test_worker_http.py index 4d8b12ddb6..36213589dd 100644 --- a/distributed/http/worker/tests/test_worker_http.py +++ b/distributed/http/worker/tests/test_worker_http.py @@ -15,7 +15,13 @@ ) -@gen_cluster(client=True, nthreads=[("127.0.0.1", 1)]) +@gen_cluster( + client=True, + nthreads=[("127.0.0.1", 1)], + config={ + "distributed.admin.system-monitor.gil.enabled": True, + }, +) async def test_prometheus(c, s, a): pytest.importorskip("prometheus_client")