Skip to content

Commit

Permalink
Move slurm_topo_build_config() after build_all_nodeline_info()
Browse files Browse the repository at this point in the history
node_record_count is recalculated after build_all_nodeline_info(). So
redo the topology after the nodes have been redone after a reconfigure.

This allows the creation of switch bitmaps with the right size and with
the correct reference to nodes.

Prepend calls with rehash_node() to match other places where
slurm_topo_build_config() is called. See 9cd8d95, 46a47ab.

Bug 13805
  • Loading branch information
fafik23 authored and gaijin03 committed Mar 30, 2023
1 parent 02e600b commit 7f988ec
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
1 change: 1 addition & 0 deletions NEWS
Expand Up @@ -13,6 +13,7 @@ documents those changes that are of interest to users and administrators.
-- scrontab - don't update the cron job tasks if the whole crontab file is
left untouched after opening it with "scrontab -e".
-- mpi/pmix - avoid crashing when running PMIx v5.0 branch with shmem support.
-- Fix building switch topology after a reconfig with the correct nodes.

* Changes in Slurm 23.02.1
==========================
Expand Down
15 changes: 8 additions & 7 deletions src/slurmd/slurmd/slurmd.c
Expand Up @@ -1229,13 +1229,6 @@ _reconfigure(void)
cgroup_conf_reinit();
_read_config();

/*
* Rebuild topology information and refresh slurmd topo infos
*/
slurm_topo_build_config();
_set_topo_info();
route_g_reconfigure();

/*
* In case the administrator changed the cpu frequency set capabilities
* on this node, rebuild the cpu frequency table information
Expand Down Expand Up @@ -1270,6 +1263,14 @@ _reconfigure(void)
_dynamic_reconfig();
_load_gres();

/*
* Rebuild topology information and refresh slurmd topo infos
*/
rehash_node();
slurm_topo_build_config();
_set_topo_info();
route_g_reconfigure();

build_conf_buf();

slurm_mutex_lock(&cached_features_mutex);
Expand Down

0 comments on commit 7f988ec

Please sign in to comment.