Skip to content
Snippets Groups Projects
Commit e76a0c9b authored by Morris Jette's avatar Morris Jette
Browse files

Partial revert of commit e60abe43

The change in function call order of commit e60abe43
resulted in slurmd daemons on front-end systems not registering with the
proper node name.
parent ccb8b419
No related branches found
No related tags found
No related merge requests found
......@@ -1204,6 +1204,13 @@ _slurmd_init(void)
* proper hostname is set.
*/
slurm_conf_init(conf->conffile);
init_node_conf();
/* slurm_select_init() must be called before
* build_all_nodeline_info() to be called with proper argument. */
if (slurm_select_init(1) != SLURM_SUCCESS )
return SLURM_FAILURE;
build_all_nodeline_info(true);
build_all_frontend_info(true);
/*
* Read global slurm config file, override necessary values from
......@@ -1211,19 +1218,6 @@ _slurmd_init(void)
*/
_read_config();
init_node_conf();
/* slurm_select_init must be called before
build_all_nodeline_info to be set up correctly.
slurm_select_init will be call inside
build_all_nodeline_info without the 1 otherwise.
*/
if (slurm_select_init(1) != SLURM_SUCCESS )
return SLURM_FAILURE;
build_all_nodeline_info(true);
build_all_frontend_info(true);
cpu_cnt = MAX(conf->conf_cpus, conf->block_map_size);
if ((gres_plugin_init() != SLURM_SUCCESS) ||
......
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