Skip to content
Snippets Groups Projects
Commit 6985ccba authored by Tim Wickberg's avatar Tim Wickberg
Browse files

X11 forwarding - fix keepalive messaging support.

Bug 3647.
parent c3c58ea5
No related branches found
No related tags found
No related merge requests found
......@@ -12,6 +12,7 @@ documents those changes that are of interest to users and administrators.
NumNodes with scontrol.
-- Don't initialize MPI plugins for batch or extern steps.`
-- slurm.spec - do not install a slurm.conf file under /etc/ld.so.conf.d.
-- X11 forwarding - fix keepalive message generation code.
* Changes in Slurm 17.11.0rc2
==============================
......
......@@ -301,6 +301,15 @@ extern int setup_x11_forward(stepd_step_rec_t *job, int *display)
info("X11 forwarding established on DISPLAY=localhost:%d.0",
x11_display);
/*
* Send keepalives every 60 seconds, and have the server
* send a reply as well. Since we're running async, a separate
* thread will need to handle sending these periodically per
* the libssh2 documentation, as the library itself won't manage
* this for us.
*/
libssh2_keepalive_config(session, 1, 60);
slurm_thread_create_detached(NULL, _keepalive_engine, NULL);
slurm_thread_create_detached(NULL, _accept_engine, NULL);
......@@ -333,7 +342,7 @@ void *_keepalive_engine(void *x)
slurm_mutex_lock(&ssh_lock);
libssh2_keepalive_send(session, &delay);
slurm_mutex_unlock(&ssh_lock);
sleep(60);
sleep(delay);
}
debug2("exiting %s", __func__);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment