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

Merge branch 'slurm-17.02' into slurm-17.11

parents 5c8973dd 32c93fce
No related branches found
No related tags found
No related merge requests found
...@@ -545,7 +545,9 @@ documents those changes that are of interest to users and administrators. ...@@ -545,7 +545,9 @@ documents those changes that are of interest to users and administrators.
-- MYSQL - Add dynamic_offset in the database to force range for auto -- MYSQL - Add dynamic_offset in the database to force range for auto
increment ids for the tres_table. increment ids for the tres_table.
-- Avoid setting node in COMPLETING state indefinitely if the job initiating -- Avoid setting node in COMPLETING state indefinitely if the job initiating
the node reboot is cancelled while the reboot in in progress. the node reboot is cancelled while the reboot in in progress.
-- node_feature/knl_cray - Fix memory leaks that occur when slurmctld
reconfigured.
* Changes in Slurm 17.02.9 * Changes in Slurm 17.02.9
========================== ==========================
......
...@@ -1680,12 +1680,14 @@ extern int init(void) ...@@ -1680,12 +1680,14 @@ extern int init(void)
xfree(capmc_path); xfree(capmc_path);
capmc_poll_freq = 45; capmc_poll_freq = 45;
capmc_timeout = DEFAULT_CAPMC_TIMEOUT; capmc_timeout = DEFAULT_CAPMC_TIMEOUT;
xfree(cnselect_path);
debug_flag = false; debug_flag = false;
default_mcdram = KNL_CACHE; default_mcdram = KNL_CACHE;
default_numa = KNL_ALL2ALL; default_numa = KNL_ALL2ALL;
for (i = 0; i < KNL_MCDRAM_CNT; i++) for (i = 0; i < KNL_MCDRAM_CNT; i++)
mcdram_pct[i] = -1; mcdram_pct[i] = -1;
mcdram_set = 0; mcdram_set = 0;
xfree(syscfg_path);
knl_conf_file = get_extra_conf_path("knl_cray.conf"); knl_conf_file = get_extra_conf_path("knl_cray.conf");
if ((stat(knl_conf_file, &stat_buf) == 0) && if ((stat(knl_conf_file, &stat_buf) == 0) &&
......
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