Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
6985ccba
Commit
6985ccba
authored
7 years ago
by
Tim Wickberg
Browse files
Options
Downloads
Patches
Plain Diff
X11 forwarding - fix keepalive messaging support.
Bug 3647.
parent
c3c58ea5
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
NEWS
+1
-0
1 addition, 0 deletions
NEWS
src/slurmd/slurmstepd/x11_forwarding.c
+10
-1
10 additions, 1 deletion
src/slurmd/slurmstepd/x11_forwarding.c
with
11 additions
and
1 deletion
NEWS
+
1
−
0
View file @
6985ccba
...
...
@@ -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
==============================
...
...
This diff is collapsed.
Click to expand it.
src/slurmd/slurmstepd/x11_forwarding.c
+
10
−
1
View file @
6985ccba
...
...
@@ -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__
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment