Skip to content

Enable the SSHManager tests on 32-bit platforms #16

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

Merged
merged 2 commits into from
Dec 9, 2024
Merged

Enable the SSHManager tests on 32-bit platforms #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90aba40
Enable the SSHManager tests on 32-bit platforms
JamesWrigley Dec 6, 2024
3134c5a
Replace a timeout task with timedwait()
JamesWrigley Dec 6, 2024
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
5 changes: 5 additions & 0 deletions docs/src/_changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ CurrentModule = DistributedNext
This documents notable changes in DistributedNext.jl. The format is based on
[Keep a Changelog](https://keepachangelog.com).

## Unreleased

### Fixed
- Fixed a cause of potential hangs when exiting the process ([#16]).

## [v1.0.0] - 2024-12-02

### Added
Expand Down
12 changes: 2 additions & 10 deletions src/cluster.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,17 +712,9 @@ function create_worker(manager, wconfig)
send_msg_now(w, MsgHeader(RRID(0,0), ntfy_oid), join_message)

errormonitor(@async manage(w.manager, w.id, w.config, :register))

# wait for rr_ntfy_join with timeout
timedout = false
errormonitor(
@async begin
sleep($timeout)
timedout = true
put!(rr_ntfy_join, 1)
end
)
wait(rr_ntfy_join)
if timedout
if timedwait(() -> isready(rr_ntfy_join), timeout) === :timed_out
error("worker did not connect within $timeout seconds")
end
lock(client_refs) do
Expand Down
4 changes: 2 additions & 2 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ include(joinpath(Sys.BINDIR, "..", "share", "julia", "test", "testenv.jl"))

cmd = `$test_exename $test_exeflags`

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