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
63faf1f0
Commit
63faf1f0
authored
11 years ago
by
Morris Jette
Browse files
Options
Downloads
Patches
Plain Diff
remove return code that is always zero
No change in logic. Just remove redundant function return code.
parent
e2524968
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/slurmctld/backup.c
+6
-11
6 additions, 11 deletions
src/slurmctld/backup.c
with
6 additions
and
11 deletions
src/slurmctld/backup.c
+
6
−
11
View file @
63faf1f0
...
@@ -83,7 +83,7 @@
...
@@ -83,7 +83,7 @@
static
int
_background_process_msg
(
slurm_msg_t
*
msg
);
static
int
_background_process_msg
(
slurm_msg_t
*
msg
);
static
void
*
_background_rpc_mgr
(
void
*
no_data
);
static
void
*
_background_rpc_mgr
(
void
*
no_data
);
static
void
*
_background_signal_hand
(
void
*
no_data
);
static
void
*
_background_signal_hand
(
void
*
no_data
);
static
int
_backup_reconfig
(
void
);
static
void
_backup_reconfig
(
void
);
static
int
_ping_controller
(
void
);
static
int
_ping_controller
(
void
);
static
int
_shutdown_primary_controller
(
int
wait_time
);
static
int
_shutdown_primary_controller
(
int
wait_time
);
static
void
_trigger_slurmctld_event
(
uint32_t
trig_type
);
static
void
_trigger_slurmctld_event
(
uint32_t
trig_type
);
...
@@ -278,14 +278,9 @@ static void *_background_signal_hand(void *no_data)
...
@@ -278,14 +278,9 @@ static void *_background_signal_hand(void *no_data)
* restart the (possibly new) plugin.
* restart the (possibly new) plugin.
*/
*/
lock_slurmctld
(
config_write_lock
);
lock_slurmctld
(
config_write_lock
);
rc
=
_backup_reconfig
();
_backup_reconfig
();
if
(
rc
)
/* Leave config lock set through this */
error
(
"_backup_reconfig: %s"
,
_update_cred_key
();
slurm_strerror
(
rc
));
else
{
/* Leave config lock set through this */
_update_cred_key
();
}
unlock_slurmctld
(
config_write_lock
);
unlock_slurmctld
(
config_write_lock
);
break
;
break
;
case
SIGABRT
:
/* abort */
case
SIGABRT
:
/* abort */
...
@@ -477,12 +472,12 @@ static int _ping_controller(void)
...
@@ -477,12 +472,12 @@ static int _ping_controller(void)
* upon old job state information.
* upon old job state information.
* This is a stripped down version of read_slurm_conf(0).
* This is a stripped down version of read_slurm_conf(0).
*/
*/
static
int
_backup_reconfig
(
void
)
static
void
_backup_reconfig
(
void
)
{
{
slurm_conf_reinit
(
NULL
);
slurm_conf_reinit
(
NULL
);
update_logging
();
update_logging
();
slurmctld_conf
.
last_update
=
time
(
NULL
);
slurmctld_conf
.
last_update
=
time
(
NULL
);
return
SLURM_SUCCESS
;
return
;
}
}
/*
/*
...
...
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