Skip to content

Commit 12d15ac

Browse files
BradshawzMongoDB Bot
authored andcommitted
SERVER-105219 [v7.0] Update timeouts for s390x (#36248)
GitOrigin-RevId: 44db0027fb079136ff09df98063b07126f974a77
1 parent 30fbdf4 commit 12d15ac

File tree

3 files changed

+101
-0
lines changed

3 files changed

+101
-0
lines changed

etc/evergreen_timeouts.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,43 @@ overrides:
7878
ubuntu1804-asan:
7979
- task: aggregation_timeseries_fuzzer
8080
exec_timeout: 150 # 2.5 hours
81+
82+
enterprise-rhel-83-s390x:
83+
- task: ^archive_.*
84+
exec_timeout: 840 # 14 hours
85+
- task: ^compile_.*
86+
exec_timeout: 840 # 14 hours
87+
- task: ^stitch_.*
88+
exec_timeout: 840 # 14 hours
89+
- task: ^crypt_.*
90+
exec_timeout: 840 # 14 hours
91+
92+
enterprise-rhel-83-s390x-shared:
93+
- task: ^archive_.*
94+
exec_timeout: 840 # 14 hours
95+
- task: ^compile_.*
96+
exec_timeout: 840 # 14 hours
97+
- task: ^stitch_.*
98+
exec_timeout: 840 # 14 hours
99+
- task: ^crypt_.*
100+
exec_timeout: 840 # 14 hours
101+
102+
enterprise-rhel-9-s390x:
103+
- task: ^archive_.*
104+
exec_timeout: 840 # 14 hours
105+
- task: ^compile_.*
106+
exec_timeout: 840 # 14 hours
107+
- task: ^stitch_.*
108+
exec_timeout: 840 # 14 hours
109+
- task: ^crypt_.*
110+
exec_timeout: 840 # 14 hours
111+
112+
enterprise-rhel-9-s390x-shared:
113+
- task: ^archive_.*
114+
exec_timeout: 840 # 14 hours
115+
- task: ^compile_.*
116+
exec_timeout: 840 # 14 hours
117+
- task: ^stitch_.*
118+
exec_timeout: 840 # 14 hours
119+
- task: ^crypt_.*
120+
exec_timeout: 840 # 14 hours

etc/evergreen_yml_components/definitions.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ variables:
137137
- func: "apply compile expansions"
138138
- func: "set task expansion macros"
139139
- func: "f_expansions_write"
140+
- func: "override task timeout"
140141
teardown_task:
141142
- func: "f_expansions_write"
142143
- func: "attach scons logs"
@@ -209,6 +210,7 @@ variables:
209210
- func: "apply compile expansions"
210211
- func: "set task expansion macros"
211212
- func: "f_expansions_write"
213+
- func: "override task timeout"
212214
teardown_task:
213215
- func: "attach scons logs"
214216
- func: "send scons cedar report"
@@ -716,6 +718,30 @@ functions:
716718
exec_timeout_secs: ${exec_timeout_secs}
717719
timeout_secs: ${timeout_secs}
718720

721+
"override task timeout":
722+
- *f_expansions_write
723+
- command: subprocess.exec
724+
params:
725+
binary: bash
726+
args:
727+
- "src/evergreen/run_python_script.sh"
728+
- "evergreen/generate_override_timeout.py"
729+
- "--variant_name"
730+
- "${compile_variant}"
731+
- "--task_name"
732+
- "${task_name}"
733+
- *f_expansions_write
734+
- command: expansions.update
735+
params:
736+
ignore_missing_file: true
737+
file: src/override_task_timeout.yml
738+
- *f_expansions_write
739+
- command: timeout.update
740+
params:
741+
exec_timeout_secs: ${override_task_timeout}
742+
timeout_secs: ${override_task_timeout}
743+
- *f_expansions_write
744+
719745
### Set expansion macros used in each task.
720746
"set task expansion macros": &set_task_expansion_macros
721747
command: expansions.update
@@ -8435,6 +8461,7 @@ task_groups:
84358461
- func: "apply compile expansions"
84368462
- func: "set task expansion macros"
84378463
- func: "f_expansions_write"
8464+
- func: "override task timeout"
84388465
teardown_task:
84398466
- func: "attach scons logs"
84408467
- func: "send scons cedar report"
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import argparse
2+
import re
3+
4+
import yaml
5+
6+
parser = argparse.ArgumentParser()
7+
parser.add_argument("--variant_name")
8+
parser.add_argument("--task_name")
9+
args = parser.parse_args()
10+
11+
with open("etc/evergreen_yml_components/configuration.yml") as f:
12+
yml = yaml.safe_load(f)
13+
default_timeout = yml["exec_timeout_secs"]
14+
15+
override_timeout = None
16+
with open("etc/evergreen_timeouts.yml") as f:
17+
yml = yaml.safe_load(f)
18+
if args.variant_name in yml["overrides"]:
19+
for task in yml["overrides"][args.variant_name]:
20+
if re.search(task["task"], args.task_name):
21+
override_timeout = task["exec_timeout"] * 60
22+
break
23+
24+
with open("override_task_timeout.yml", "w") as f:
25+
if override_timeout:
26+
print(
27+
f"Overriding timeout for {args.variant_name}:{args.task_name} of {override_timeout} seconds."
28+
)
29+
f.write(f"override_task_timeout: {override_timeout}")
30+
else:
31+
print(
32+
f"Using default timeout for {args.variant_name}:{args.task_name} of {override_timeout} seconds."
33+
)
34+
f.write(f"override_task_timeout: {default_timeout}")

0 commit comments

Comments
 (0)