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
b8b7f2d6
Commit
b8b7f2d6
authored
9 years ago
by
Danny Auble
Browse files
Options
Downloads
Patches
Plain Diff
Fix issue with wrong protocol version when using the srun --no-allocate
option.
parent
675c8815
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
+2
-0
2 additions, 0 deletions
NEWS
src/api/step_launch.c
+9
-3
9 additions, 3 deletions
src/api/step_launch.c
with
11 additions
and
3 deletions
NEWS
+
2
−
0
View file @
b8b7f2d6
...
...
@@ -69,6 +69,8 @@ documents those changes that are of interest to users and administrators.
-- Add [Alloc|Req]Nodes to sacct to be more like cpus.
-- Fix sacct documentation about [Alloc|Req]TRES
-- Put node count in TRES string for steps.
-- Fix issue with wrong protocol version when using the srun --no-allocate
option.
* Changes in Slurm 15.08.0
==========================
...
...
This diff is collapsed.
Click to expand it.
src/api/step_launch.c
+
9
−
3
View file @
b8b7f2d6
...
...
@@ -805,7 +805,9 @@ void slurm_step_launch_fwd_signal(slurm_step_ctx_t *ctx, int signo)
slurm_msg_t_init
(
&
req
);
req
.
msg_type
=
REQUEST_SIGNAL_TASKS
;
req
.
data
=
&
msg
;
req
.
protocol_version
=
ctx
->
step_resp
->
use_protocol_ver
;
if
(
ctx
->
step_resp
->
use_protocol_ver
)
req
.
protocol_version
=
ctx
->
step_resp
->
use_protocol_ver
;
debug3
(
"sending signal %d to job %u on host %s"
,
signo
,
ctx
->
job_id
,
name
);
...
...
@@ -1599,7 +1601,9 @@ static int _fail_step_tasks(slurm_step_ctx_t *ctx, char *node, int ret_code)
slurm_msg_t_init
(
&
req
);
req
.
msg_type
=
REQUEST_STEP_COMPLETE
;
req
.
data
=
&
msg
;
req
.
protocol_version
=
ctx
->
step_resp
->
use_protocol_ver
;
if
(
ctx
->
step_resp
->
use_protocol_ver
)
req
.
protocol_version
=
ctx
->
step_resp
->
use_protocol_ver
;
if
(
slurm_send_recv_controller_rc_msg
(
&
req
,
&
rc
)
<
0
)
return
SLURM_ERROR
;
...
...
@@ -1643,7 +1647,9 @@ static int _launch_tasks(slurm_step_ctx_t *ctx,
slurm_msg_t_init
(
&
msg
);
msg
.
msg_type
=
REQUEST_LAUNCH_TASKS
;
msg
.
data
=
launch_msg
;
msg
.
protocol_version
=
ctx
->
step_resp
->
use_protocol_ver
;
if
(
ctx
->
step_resp
->
use_protocol_ver
)
msg
.
protocol_version
=
ctx
->
step_resp
->
use_protocol_ver
;
#ifdef HAVE_FRONT_END
slurm_cred_get_args
(
ctx
->
step_resp
->
cred
,
&
cred_args
);
...
...
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