Skip to content

Commit b03db8e

Browse files
authored
Merge pull request #16 from JuliaParallel/sshmanager-32bit
Enable the SSHManager tests on 32-bit platforms
2 parents b743ec8 + 3134c5a commit b03db8e

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

docs/src/_changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ CurrentModule = DistributedNext
77
This documents notable changes in DistributedNext.jl. The format is based on
88
[Keep a Changelog](https://keepachangelog.com).
99

10+
## Unreleased
11+
12+
### Fixed
13+
- Fixed a cause of potential hangs when exiting the process ([#16]).
14+
1015
## [v1.0.0] - 2024-12-02
1116

1217
### Added

src/cluster.jl

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -712,17 +712,9 @@ function create_worker(manager, wconfig)
712712
send_msg_now(w, MsgHeader(RRID(0,0), ntfy_oid), join_message)
713713

714714
errormonitor(@async manage(w.manager, w.id, w.config, :register))
715+
715716
# wait for rr_ntfy_join with timeout
716-
timedout = false
717-
errormonitor(
718-
@async begin
719-
sleep($timeout)
720-
timedout = true
721-
put!(rr_ntfy_join, 1)
722-
end
723-
)
724-
wait(rr_ntfy_join)
725-
if timedout
717+
if timedwait(() -> isready(rr_ntfy_join), timeout) === :timed_out
726718
error("worker did not connect within $timeout seconds")
727719
end
728720
lock(client_refs) do

test/runtests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ include(joinpath(Sys.BINDIR, "..", "share", "julia", "test", "testenv.jl"))
88

99
cmd = `$test_exename $test_exeflags`
1010

11-
# LibSSH.jl currently only works on 64bit unixes
12-
if Sys.isunix() && Sys.WORD_SIZE == 64
11+
# LibSSH.jl currently only works on unixes
12+
if Sys.isunix()
1313
# Run the SSH tests with a single thread because LibSSH.jl is not thread-safe
1414
sshtestfile = joinpath(@__DIR__, "sshmanager.jl")
1515
run(addenv(`$cmd $sshtestfile`, "JULIA_NUM_THREADS" => "1"))

0 commit comments

Comments
 (0)