diff options
| author | Zituo Jin <zituo.jin@mongodb.com> | 2021-10-14 19:30:57 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-10-14 19:55:40 +0000 |
| commit | 96d7de9c7847738cd19d7ffca6e5a1f0f340dff4 (patch) | |
| tree | d1e1e614169181d54020cebe43c9a6ef95bb4fbc /buildscripts | |
| parent | 16c954fa873af6c06ae5428b8af7db3363ae8747 (diff) | |
| download | mongo-96d7de9c7847738cd19d7ffca6e5a1f0f340dff4.tar.gz | |
SERVER-60159 increase priority of query patch variants
Diffstat (limited to 'buildscripts')
| -rw-r--r-- | buildscripts/evergreen_gen_build_variant.py | 11 | ||||
| -rw-r--r-- | buildscripts/tests/test_evergreen_gen_build_variant.py | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/buildscripts/evergreen_gen_build_variant.py b/buildscripts/evergreen_gen_build_variant.py index c64bd5538b3..9927ee53600 100644 --- a/buildscripts/evergreen_gen_build_variant.py +++ b/buildscripts/evergreen_gen_build_variant.py @@ -319,6 +319,15 @@ class GenerateBuildVariantOrchestrator: LOGGER.info("Configure task", task_id=task.task_id, priority=priority) self.evg_api.configure_task(task.task_id, priority=priority) + @classmethod + def _should_adjust_task_priority(cls, task, gen_tasks): + if task.display_name in gen_tasks: + return True + # Test out the effect of Evergreen capacity constraints. + if task.build_variant.endswith("-query-patch-only"): + return True + return False + def adjust_gen_tasks_priority(self, gen_tasks: Set[str]) -> int: """ Increase the priority of any "_gen" tasks. @@ -334,7 +343,7 @@ class GenerateBuildVariantOrchestrator: with Executor(max_workers=MAX_WORKERS) as exe: jobs = [ exe.submit(self.adjust_task_priority, task) for task in task_list - if task.display_name in gen_tasks + if self._should_adjust_task_priority(task, gen_tasks) ] results = [j.result() for j in jobs] diff --git a/buildscripts/tests/test_evergreen_gen_build_variant.py b/buildscripts/tests/test_evergreen_gen_build_variant.py index 37fe047e440..5fece87bd09 100644 --- a/buildscripts/tests/test_evergreen_gen_build_variant.py +++ b/buildscripts/tests/test_evergreen_gen_build_variant.py @@ -291,7 +291,8 @@ class TestAdjustGenTasksPriority(unittest.TestCase): gen_tasks = {"task_3", "task_8", "task_13"} n_build_tasks = 25 mock_task_list = [ - MagicMock(display_name=f"task_{i}", priority=0) for i in range(n_build_tasks) + MagicMock(build_variant='dummy_variant', display_name=f"task_{i}", priority=0) + for i in range(n_build_tasks) ] mock_orchestrator = build_mock_orchestrator(build_task_list=mock_task_list) |