fixup! Add support for worker statuses

Author: JamesWrigley

src/cluster.jl

@@ -891,7 +891,7 @@ const HDR_COOKIE_LEN = 16
 const map_pid_wrkr = Lockable(Dict{Int, Union{Worker, LocalProcess}}())
 const map_sock_wrkr = Lockable(IdDict())
 const map_del_wrkr = Lockable(Set{Int}())
-const _exited_callback_pid = ScopedValue{Int}()
+const _exited_callback_pid = ScopedValue{Int}(-1)
 const map_pid_statuses = Lockable(Dict{Int, Any}())
 const worker_starting_callbacks = Dict{Any, Base.Callable}()
 const worker_started_callbacks = Dict{Any, Base.Callable}()
@@ -1323,7 +1323,7 @@ function getstatus(mod::Module, pid::Int=myid())
     # During the worker-exited callbacks this function may be called, at which
     # point it will not exist in procs(). Thus we check whether the function is
     # being called for an exited worker and allow it if so.
-    if pid ∉ procs() && !(isassigned(_exited_callback_pid) && _exited_callback_pid[] == pid)
+    if pid ∉ procs() && _exited_callback_pid[] != pid
         throw(ArgumentError("Worker $(pid) does not exist, cannot get its status"))
     end
 

test/distributed_exec.jl

@@ -1826,7 +1826,9 @@ end
     let julia = `$(Base.julia_cmd()) --startup-file=no`; mktempdir() do tmp
         pkg_project = joinpath(Base.pkgdir(DistributedNext), "Project.toml")
         project = mkdir(joinpath(tmp, "project"))
-        depots = [mkdir(joinpath(tmp, "depot1")), mkdir(joinpath(tmp, "depot2"))]
+        # Keep the writable depot in the depots list so that external
+        # dependencies (i.e. ScopedValues.jl) can be loaded.
+        depots = [mkdir(joinpath(tmp, "depot1")), mkdir(joinpath(tmp, "depot2")), Base.DEPOT_PATH[1]]
         load_path = [mkdir(joinpath(tmp, "load_path")), "@stdlib", "@", pkg_project]
         pathsep = Sys.iswindows() ? ";" : ":"
         env = Dict(
@@ -1935,15 +1937,15 @@ end
         project = mktempdir()
         env = Dict(
             "JULIA_LOAD_PATH" => string(LOAD_PATH[1], $(repr(pathsep)), "@stdlib", $(repr(pathsep)), "$(escaped_pkg_project)"),
-            "JULIA_DEPOT_PATH" => DEPOT_PATH[1],
+            "JULIA_DEPOT_PATH" => DEPOT_PATH[end],
             "TMPDIR" => ENV["TMPDIR"],
         )
         addprocs(1; env = env, exeflags = `--project=\$(project)`)
         env["JULIA_PROJECT"] = project
         addprocs(1; env = env)
         """ * funcscode * """
         for w in workers()
-            @test remotecall_fetch(depot_path, w)          == [DEPOT_PATH[1]]
+            @test remotecall_fetch(depot_path, w)          == [DEPOT_PATH[end]]
             @test remotecall_fetch(load_path, w)           == [LOAD_PATH[1], "@stdlib", "$(escaped_pkg_project)"]
             @test remotecall_fetch(active_project, w)      == project
             @test remotecall_fetch(Base.active_project, w) == joinpath(project, "Project.toml")