Skip to content

Commit ecdb4be

Browse files
authored
Increase the timeout for worker removal under rr (#59214)
rr can make things slower, particularly under load. We saw the removal timeout in https://buildkite.com/julialang/julia-master-scheduled/builds/1228/steps/canvas?sid=0198793f-b191-4207-8793-a347afd2f71f but I can't see a great rason why that happened, so let's bump the timeout to 5 minute to give it plenty of time to exit properly.
1 parent b61c60c commit ecdb4be

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

test/runtests.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ else
2525
global running_under_rr() = false
2626
end
2727

28+
const rmwait_timeout = running_under_rr() ? 300 : 30
29+
2830
if use_revise
2931
# First put this at the top of the DEPOT PATH to install revise if necessary.
3032
# Once it's loaded, we swizzle it to the end, to avoid confusing any tests.
@@ -278,7 +280,7 @@ cd(@__DIR__) do
278280
elseif n > 1
279281
# the worker encountered some failure, recycle it
280282
# so future tests get a fresh environment
281-
rmprocs(wrkr, waitfor=30)
283+
rmprocs(wrkr, waitfor=rmwait_timeout)
282284
p = addprocs_with_testenv(1)[1]
283285
remotecall_fetch(include, p, "testdefs.jl")
284286
if use_revise
@@ -291,7 +293,7 @@ cd(@__DIR__) do
291293
# the worker has reached the max-rss limit, recycle it
292294
# so future tests start with a smaller working set
293295
if n > 1
294-
rmprocs(wrkr, waitfor=30)
296+
rmprocs(wrkr, waitfor=rmwait_timeout)
295297
p = addprocs_with_testenv(1)[1]
296298
remotecall_fetch(include, p, "testdefs.jl")
297299
if use_revise
@@ -305,7 +307,7 @@ cd(@__DIR__) do
305307
end
306308
if p != 1
307309
# Free up memory =)
308-
rmprocs(p, waitfor=30)
310+
rmprocs(p, waitfor=rmwait_timeout)
309311
end
310312
end
311313
end

0 commit comments

Comments
 (0)