fix #28499, calling cluster_cookie before cluster starts (#28656)

(cherry picked from commit 630f53a)
JuliaLang · Sep 8, 2018 · f4c81c5 · f4c81c5
1 parent bbd310f
commit f4c81c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/stdlib/Distributed/src/cluster.jl b/stdlib/Distributed/src/cluster.jl
@@ -644,14 +644,15 @@ end
 
 Return the cluster cookie.
 """
-cluster_cookie() = LPROC.cookie
+cluster_cookie() = (init_multi(); LPROC.cookie)
 
 """
     cluster_cookie(cookie) -> cookie
 
 Set the passed cookie as the cluster cookie, then returns it.
 """
 function cluster_cookie(cookie)
+    init_multi()
     # The cookie must be an ASCII string with length <=  HDR_COOKIE_LEN
     @assert isascii(cookie)
     @assert length(cookie) <= HDR_COOKIE_LEN

diff --git a/stdlib/Distributed/test/distributed_exec.jl b/stdlib/Distributed/test/distributed_exec.jl
@@ -3,6 +3,8 @@
 using Test, Distributed, Random, Serialization, Sockets
 import Distributed: launch, manage
 
+@test cluster_cookie() isa String
+
 include(joinpath(Sys.BINDIR, "..", "share", "julia", "test", "testenv.jl"))
 
 @test Distributed.extract_imports(:(begin; import Foo, Bar; let; using Baz; end; end)) ==