fixup! debug

Author: JamesWrigley

src/cluster.jl

@@ -1058,22 +1058,22 @@ julia> workers()
  6
 ```
 """
-function rmprocs(pids...; waitfor=typemax(Int))
+function rmprocs(pids...; exit_timeout=15, waitfor=typemax(Int))
     cluster_mgmt_from_master_check()
 
     pids = vcat(pids...)
     if waitfor == 0
-        t = @async _rmprocs(pids, typemax(Int))
+        t = @async _rmprocs(pids, typemax(Int), exit_timeout)
         yield()
         return t
     else
-        _rmprocs(pids, waitfor)
+        _rmprocs(pids, waitfor, exit_timeout)
         # return a dummy task object that user code can wait on.
         return @async nothing
     end
 end
 
-function _rmprocs(pids, waitfor)
+function _rmprocs(pids, waitfor, exit_timeout)
     lock(worker_lock)
     try
         rmprocset = Union{LocalProcess, Worker}[]
@@ -1084,7 +1084,7 @@ function _rmprocs(pids, waitfor)
                 if haskey(map_pid_wrkr, p)
                     w = map_pid_wrkr[p]
                     set_worker_state(w, W_TERMINATING)
-                    kill(w.manager, p, w.config)
+                    kill(w.manager, p, w.config; exit_timeout)
                     push!(rmprocset, w)
                 end
             end

src/managers.jl

@@ -749,7 +749,7 @@ It should cause the remote worker specified by `pid` to exit.
 `kill(manager::ClusterManager.....)` executes a remote `exit()`
 on `pid`.
 """
-function kill(manager::ClusterManager, pid::Int, config::WorkerConfig)
+function kill(manager::ClusterManager, pid::Int, config::WorkerConfig; kwargs...)
     remote_do(exit, pid)
     nothing
 end

test/topology.jl

@@ -140,7 +140,7 @@ using Random
 
     @info "finished master-worker"
     # With lazy=false, all connections ought to be setup during `addprocs`
-    nprocs() > 1 && rmprocs(workers())
+    nprocs() > 1 && rmprocs(workers(); exit_timeout=30)
     addprocs_with_testenv(8; lazy=false)
     def_count_conn()
     @test sum(asyncmap(p->remotecall_fetch(count_connected_workers,p), workers())) == 64