diff --git a/src/slurmctld/.state_save.c.swo b/src/slurmctld/.state_save.c.swo deleted file mode 100644 index ffc9c9c977707d4394aafbded0688f4abf97f962..0000000000000000000000000000000000000000 Binary files a/src/slurmctld/.state_save.c.swo and /dev/null differ diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c index 9534b0021e4226a01f0f42c95e508cc3098a73f8..b6a02d04a2207243950e5b054f40b5c3564cb679 100644 --- a/src/slurmctld/job_mgr.c +++ b/src/slurmctld/job_mgr.c @@ -201,6 +201,7 @@ static uint32_t _max_switch_wait(uint32_t input_wait); static void _notify_srun_missing_step(struct job_record *job_ptr, int node_inx, time_t now, time_t node_boot_time); static int _open_job_state_file(char **state_file); +static time_t _get_last_job_state_write_time(void); static void _pack_job_for_ckpt (struct job_record *job_ptr, Buf buffer); static void _pack_default_job_details(struct job_record *job_ptr, Buf buffer, @@ -675,7 +676,7 @@ int dump_all_job_state(void) /* Check that last state file was written at expected time. * This is a check for two slurmctld daemons running at the same * time in primary mode (a split-brain problem). */ - last_state_file_time = get_last_state_write_time(); + last_state_file_time = _get_last_job_state_write_time(); if (last_file_write_time && last_state_file_time && (last_file_write_time != last_state_file_time)) { error("Bad job state save file time. We wrote it at time %u, " @@ -855,7 +856,7 @@ extern void backup_slurmctld_restart(void) /* Return the time stamp in the current job state save file, 0 is returned on * error */ -extern time_t get_last_state_write_time(void) +static time_t _get_last_job_state_write_time(void) { int data_allocated, data_read = 0, error_code = SLURM_SUCCESS; uint32_t data_size = 0; diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h index 348616881cef3f94bcbe0d24ee006acfdf04f8ae..2ed4a8070872c0cf6dd986abeb002425569ed059 100644 --- a/src/slurmctld/slurmctld.h +++ b/src/slurmctld/slurmctld.h @@ -943,10 +943,6 @@ extern void set_job_tres_alloc_str(struct job_record *job_ptr, * This function can be called multiple times. */ extern void backup_slurmctld_restart(void); -/* Return the time stamp in the current job state save file, 0 is returned on - * error */ -extern time_t get_last_state_write_time(void); - /* Complete a batch job requeue logic after all steps complete so that * subsequent jobs appear in a separate accounting record. */ extern void batch_requeue_fini(struct job_record *job_ptr);