Skip to content

Commit cd2c985

Browse files
jgabler-hpcjgabler-hpc
committed
fixed issue_1741 test failing sporadically
1 parent 362b33a commit cd2c985

File tree

1 file changed

+50
-44
lines changed

1 file changed

+50
-44
lines changed

‎src/checktree/bugs/issuezilla/1741/check.exp‎

Lines changed: 50 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#
2828
# All Rights Reserved.
2929
#
30-
# Portions of this software are Copyright (c) 2023-2024 HPC-Gridware GmbH
30+
# Portions of this software are Copyright (c) 2023-2025 HPC-Gridware GmbH
3131
#
3232
##########################################################################
3333
#___INFO__MARK_END__
@@ -58,21 +58,23 @@ lappend check_functions "issue_check_unsuspended_queue" ;# functions
5858

5959
proc issue_1741_setup {} {
6060
global ts_config
61-
global check_host
61+
global issue_1741_host
6262

63-
set check_host [host_conf_get_suited_hosts]
63+
set issue_1741_host [host_conf_get_suited_hosts]
6464
}
6565

6666
proc issue_1741_cleanup {} {
67-
global check_host
67+
global issue_1741_host
6868

6969
delete_all_jobs
7070
wait_for_end_of_all_jobs
7171

7272
# delete queues (if not) in different order (a b) or (b a)
73-
del_queue "a.q" $check_host 0 1 "" "" 0
74-
del_queue "b.q" $check_host 0 1 "" "" 0
75-
del_queue "a.q" $check_host 0 1 "" "" 0
73+
del_queue "a.q" $issue_1741_host 0 1 "" "" 0
74+
del_queue "b.q" $issue_1741_host 0 1 "" "" 0
75+
del_queue "a.q" $issue_1741_host 0 1 "" "" 0
76+
77+
unset -nocomplain issue_1741_host
7678
}
7779

7880
#
@@ -98,20 +100,21 @@ proc issue_1741_cleanup {} {
98100

99101
proc issue_1741_run {} {
100102
global ts_config
103+
global issue_1741_host
101104

102-
set check_host [host_conf_get_suited_hosts]
105+
set issue_1741_host [host_conf_get_suited_hosts]
103106

104107
set queue_settings(slots) 1
105108
set queue_settings(load_thresholds) "np_load_avg=11.75"
106-
add_queue "b.q" $check_host queue_settings
109+
add_queue "b.q" $issue_1741_host queue_settings
107110

108111
set queue_settings(slots) 1
109112
set queue_settings(load_thresholds) "np_load_avg=11.75"
110113
set queue_settings(subordinate_list) "b.q=1"
111-
add_queue "a.q" $check_host queue_settings
114+
add_queue "a.q" $issue_1741_host queue_settings
112115

113-
set aq [get_queue_instance "a.q" $check_host]
114-
set bq [get_queue_instance "b.q" $check_host]
116+
set aq [get_queue_instance "a.q" $issue_1741_host]
117+
set bq [get_queue_instance "b.q" $issue_1741_host]
115118

116119
set job_id1 [submit_job "-o /dev/null -j y -q $bq $ts_config(product_root)/examples/jobs/sleeper.sh 100"]
117120
wait_for_jobstart $job_id1 "Sleeper" 20 1 1
@@ -121,14 +124,15 @@ proc issue_1741_run {} {
121124
wait_for_queue_state $bq "S" 60
122125

123126
shutdown_and_restart_qmaster
127+
wait_for_load_from_all_queues
124128

125129
wait_for_queue_state $bq "S" 60
126130

127131
delete_all_jobs
128132
wait_for_end_of_all_jobs
129133

130-
del_queue "a.q" $check_host 0 1
131-
del_queue "b.q" $check_host 0 1
134+
del_queue "a.q" $issue_1741_host 0 1
135+
del_queue "b.q" $issue_1741_host 0 1
132136
}
133137

134138
#****** check.60/issue_use_different_names() ***********************************
@@ -149,7 +153,7 @@ proc issue_1741_run {} {
149153
#*******************************************************************************
150154
proc issue_use_different_names {} {
151155
global ts_config
152-
global check_host
156+
global issue_1741_host
153157

154158
# same test as "issue_1741_run" but queues
155159
# has another alphabetical order:
@@ -165,15 +169,15 @@ proc issue_use_different_names {} {
165169

166170
set queue_settings(slots) 1
167171
set queue_settings(load_thresholds) "np_load_avg=11.75"
168-
add_queue "a.q" $check_host queue_settings
172+
add_queue "a.q" $issue_1741_host queue_settings
169173

170174
set queue_settings(slots) 1
171175
set queue_settings(load_thresholds) "np_load_avg=11.75"
172176
set queue_settings(subordinate_list) "a.q=1"
173-
add_queue "b.q" $check_host queue_settings
177+
add_queue "b.q" $issue_1741_host queue_settings
174178

175-
set aq [get_queue_instance "a.q" $check_host]
176-
set bq [get_queue_instance "b.q" $check_host]
179+
set aq [get_queue_instance "a.q" $issue_1741_host]
180+
set bq [get_queue_instance "b.q" $issue_1741_host]
177181

178182
set job_id1 [submit_job "-o /dev/null -j y -q $aq $ts_config(product_root)/examples/jobs/sleeper.sh 100"]
179183
wait_for_jobstart $job_id1 "Sleeper" 20 1 1
@@ -183,14 +187,15 @@ proc issue_use_different_names {} {
183187
wait_for_queue_state $aq "S" 60
184188

185189
shutdown_and_restart_qmaster
190+
wait_for_load_from_all_queues
186191

187192
wait_for_queue_state $aq "S" 60
188193

189194
delete_all_jobs
190195
wait_for_end_of_all_jobs
191196

192-
del_queue "b.q" $check_host 0 1
193-
del_queue "a.q" $check_host 0 1
197+
del_queue "b.q" $issue_1741_host 0 1
198+
del_queue "a.q" $issue_1741_host 0 1
194199
}
195200

196201
#****** check.60/issue_use_different_order() ***********************************
@@ -207,25 +212,25 @@ proc issue_use_different_names {} {
207212
#*******************************************************************************
208213
proc issue_use_different_order {} {
209214
global ts_config
210-
global check_host
215+
global issue_1741_host
211216

212217
# same test as "issue_1741_run" but queues
213218
# has another creation order of queues
214219

215220
set queue_settings(slots) 1
216221
set queue_settings(load_thresholds) "np_load_avg=11.75"
217-
add_queue "a.q" $check_host queue_settings
222+
add_queue "a.q" $issue_1741_host queue_settings
218223

219224
set queue_settings(slots) 1
220225
set queue_settings(load_thresholds) "np_load_avg=11.75"
221-
add_queue "b.q" $check_host queue_settings
226+
add_queue "b.q" $issue_1741_host queue_settings
222227

223228
# modify a.q
224229
set queue_settings(subordinate_list) "b.q=1"
225230
mod_queue "a.q" "" queue_settings
226231

227-
set aq [get_queue_instance "a.q" $check_host]
228-
set bq [get_queue_instance "b.q" $check_host]
232+
set aq [get_queue_instance "a.q" $issue_1741_host]
233+
set bq [get_queue_instance "b.q" $issue_1741_host]
229234

230235
set job_id1 [submit_job "-o /dev/null -j y -q $bq $ts_config(product_root)/examples/jobs/sleeper.sh 100"]
231236
wait_for_jobstart $job_id1 "Sleeper" 20 1 1
@@ -235,14 +240,15 @@ proc issue_use_different_order {} {
235240
wait_for_queue_state $bq "S" 60
236241

237242
shutdown_and_restart_qmaster
243+
wait_for_load_from_all_queues
238244

239245
wait_for_queue_state $bq "S" 60
240246

241247
delete_all_jobs
242248
wait_for_end_of_all_jobs
243249

244-
del_queue "a.q" $check_host 0 1
245-
del_queue "b.q" $check_host 0 1
250+
del_queue "a.q" $issue_1741_host 0 1
251+
del_queue "b.q" $issue_1741_host 0 1
246252
}
247253

248254

@@ -264,7 +270,7 @@ proc issue_use_different_order {} {
264270
#*******************************************************************************
265271
proc issue_check_unsuspended_queue {} {
266272
global ts_config
267-
global check_host
273+
global issue_1741_host
268274

269275
# this test checks if subordinate queue remains in
270276
# unsuspended state
@@ -276,15 +282,15 @@ proc issue_check_unsuspended_queue {} {
276282

277283
set queue_settings(slots) 1
278284
set queue_settings(load_thresholds) "np_load_avg=11.25"
279-
add_queue "b.q" $check_host queue_settings
285+
add_queue "b.q" $issue_1741_host queue_settings
280286

281287
set queue_settings(slots) 1
282288
set queue_settings(load_thresholds) "np_load_avg=11.25"
283289
set queue_settings(subordinate_list) "b.q=1"
284-
add_queue "a.q" $check_host queue_settings
290+
add_queue "a.q" $issue_1741_host queue_settings
285291

286-
set aq [get_queue_instance "a.q" $check_host]
287-
set bq [get_queue_instance "b.q" $check_host]
292+
set aq [get_queue_instance "a.q" $issue_1741_host]
293+
set bq [get_queue_instance "b.q" $issue_1741_host]
288294

289295
# start a job in subordinate b.q
290296
set job_id [submit_job "-o /dev/null -j y -q $bq $ts_config(product_root)/examples/jobs/sleeper.sh 240"]
@@ -293,7 +299,7 @@ proc issue_check_unsuspended_queue {} {
293299
shutdown_and_restart_qmaster
294300

295301
# now job in a.q is expected to run/finish after qmaster restart
296-
wait_for_load_from_all_queues 60
302+
wait_for_load_from_all_queues
297303

298304
# check queue state of b.q
299305
set state [get_queue_state $bq]
@@ -310,8 +316,8 @@ proc issue_check_unsuspended_queue {} {
310316
delete_all_jobs
311317
wait_for_end_of_all_jobs
312318

313-
del_queue "a.q" $check_host 0 1
314-
del_queue "b.q" $check_host 0 1
319+
del_queue "a.q" $issue_1741_host 0 1
320+
del_queue "b.q" $issue_1741_host 0 1
315321
}
316322

317323

@@ -329,22 +335,22 @@ proc issue_check_unsuspended_queue {} {
329335
#*******************************************************************************
330336
proc issue_check_unsuspended_queue_with_more_slots {} {
331337
global ts_config
332-
global check_host
338+
global issue_1741_host
333339

334340
# this test checks if subordinate queue remains in
335341
# unsuspended state
336342

337343
set queue_settings(slots) 1
338344
set queue_settings(load_thresholds) "np_load_avg=11.25"
339-
add_queue "b.q" $check_host queue_settings
345+
add_queue "b.q" $issue_1741_host queue_settings
340346

341347
set queue_settings(slots) 2
342348
set queue_settings(load_thresholds) "np_load_avg=11.25"
343349
set queue_settings(subordinate_list) "b.q=2"
344-
add_queue "a.q" $check_host queue_settings
350+
add_queue "a.q" $issue_1741_host queue_settings
345351

346-
set aq [get_queue_instance "a.q" $check_host]
347-
set bq [get_queue_instance "b.q" $check_host]
352+
set aq [get_queue_instance "a.q" $issue_1741_host]
353+
set bq [get_queue_instance "b.q" $issue_1741_host]
348354

349355
# start a job in subordinate b.q
350356
set job_id [submit_job "-o /dev/null -j y -q $bq $ts_config(product_root)/examples/jobs/sleeper.sh 240"]
@@ -358,7 +364,7 @@ proc issue_check_unsuspended_queue_with_more_slots {} {
358364
# other than running
359365

360366
# now job in a.q is expected to run/finish after qmaster restart
361-
wait_for_load_from_all_queues 60
367+
wait_for_load_from_all_queues
362368

363369
# check queue state of b.q
364370
set state [get_queue_state $bq]
@@ -386,8 +392,8 @@ proc issue_check_unsuspended_queue_with_more_slots {} {
386392
delete_all_jobs
387393
wait_for_end_of_all_jobs
388394

389-
del_queue "a.q" $check_host 0 1
390-
del_queue "b.q" $check_host 0 1
395+
del_queue "a.q" $issue_1741_host 0 1
396+
del_queue "b.q" $issue_1741_host 0 1
391397
}
392398

393399

0 commit comments

Comments
 (0)