Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #28499, calling cluster_cookie before cluster starts #28656

Merged
merged 1 commit into from
Aug 15, 2018
Merged

fix #28499, calling cluster_cookie before cluster starts #28656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion stdlib/Distributed/src/cluster.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions stdlib/Distributed/test/distributed_exec.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) ==
Expand Down