diff --git a/src/sacctmgr/association_functions.c b/src/sacctmgr/association_functions.c index b11be7e4835813202161040c471ec409e5807b6e..6d89cec20fed22c1e2a1b27a608aa226b0a690f3 100644 --- a/src/sacctmgr/association_functions.c +++ b/src/sacctmgr/association_functions.c @@ -362,8 +362,6 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc, set = 1; } } else if (!strncasecmp(type, "GrpCPUMins", MAX(command_len, 7))) { - sacctmgr_initialize_g_tres_list(); - if (get_uint64(value, &tmp64, "GrpCPUMins") == SLURM_SUCCESS) { set = 1; @@ -376,8 +374,6 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc, xfree(tmp_char); } } else if (!strncasecmp(type, "GrpCPURunMins", MAX(command_len, 7))) { - sacctmgr_initialize_g_tres_list(); - if (get_uint64(value, &tmp64, "GrpCPURunMins") == SLURM_SUCCESS) { set = 1; @@ -389,8 +385,6 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc, xfree(tmp_char); } } else if (!strncasecmp(type, "GrpCpus", MAX(command_len, 7))) { - sacctmgr_initialize_g_tres_list(); - if (get_uint64(value, &tmp64, "GrpCpus") == SLURM_SUCCESS) { set = 1; @@ -406,8 +400,6 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc, "GrpJobs") == SLURM_SUCCESS) set = 1; } else if (!strncasecmp(type, "GrpMemory", MAX(command_len, 4))) { - sacctmgr_initialize_g_tres_list(); - if (get_uint64(value, &tmp64, "GrpMemory") == SLURM_SUCCESS) { set = 1; @@ -419,8 +411,6 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc, xfree(tmp_char); } } else if (!strncasecmp(type, "GrpNodes", MAX(command_len, 4))) { - sacctmgr_initialize_g_tres_list(); - if (get_uint64(value, &tmp64, "GrpNodes") == SLURM_SUCCESS) { set = 1; @@ -480,8 +470,6 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc, } } else if (!strncasecmp(type, "MaxCPUMinsPerJob", MAX(command_len, 7))) { - sacctmgr_initialize_g_tres_list(); - if (get_uint64(value, &tmp64, "MaxCPUMinsPerJob") == SLURM_SUCCESS) { set = 1; @@ -493,8 +481,6 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc, xfree(tmp_char); } } else if (!strncasecmp(type, "MaxCPURunMins", MAX(command_len, 7))) { - sacctmgr_initialize_g_tres_list(); - if (get_uint64(value, &tmp64, "MaxCPURunMins") == SLURM_SUCCESS) { set = 1; @@ -506,8 +492,6 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc, xfree(tmp_char); } } else if (!strncasecmp(type, "MaxCpusPerJob", MAX(command_len, 7))) { - sacctmgr_initialize_g_tres_list(); - if (get_uint64(value, &tmp64, "MaxCpusPerJob") == SLURM_SUCCESS) { set = 1; @@ -523,8 +507,6 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc, "MaxJobs") == SLURM_SUCCESS) set = 1; } else if (!strncasecmp(type, "MaxNodesPerJob", MAX(command_len, 4))) { - sacctmgr_initialize_g_tres_list(); - if (get_uint64(value, &tmp64, "MaxNodes") == SLURM_SUCCESS) { set = 1; diff --git a/src/sacctmgr/common.c b/src/sacctmgr/common.c index 05e1864b8310488248875775d96a195104a8841b..10ff2423ca3d8cf48f636d768254875b2ddd995d 100644 --- a/src/sacctmgr/common.c +++ b/src/sacctmgr/common.c @@ -1637,18 +1637,21 @@ extern void sacctmgr_print_assoc_limits(slurmdb_assoc_rec_t *assoc) assoc->grp_submit_jobs); if (assoc->grp_tres) { + sacctmgr_initialize_g_tres_list(); tmp_char = slurmdb_make_tres_string_from_simple( assoc->grp_tres, g_tres_list); printf(" GrpTRES = %s\n", tmp_char); xfree(tmp_char); } if (assoc->grp_tres_mins) { + sacctmgr_initialize_g_tres_list(); tmp_char = slurmdb_make_tres_string_from_simple( assoc->grp_tres_mins, g_tres_list); printf(" GrpTRESMins = %s\n", tmp_char); xfree(tmp_char); } if (assoc->grp_tres_run_mins) { + sacctmgr_initialize_g_tres_list(); tmp_char = slurmdb_make_tres_string_from_simple( assoc->grp_tres_run_mins, g_tres_list); printf(" GrpTRESRunMins= %s\n", tmp_char); @@ -1676,24 +1679,28 @@ extern void sacctmgr_print_assoc_limits(slurmdb_assoc_rec_t *assoc) assoc->max_submit_jobs); if (assoc->max_tres_pj) { + sacctmgr_initialize_g_tres_list(); tmp_char = slurmdb_make_tres_string_from_simple( assoc->max_tres_pj, g_tres_list); printf(" MaxTRES = %s\n", tmp_char); xfree(tmp_char); } if (assoc->max_tres_pn) { + sacctmgr_initialize_g_tres_list(); tmp_char = slurmdb_make_tres_string_from_simple( assoc->max_tres_pn, g_tres_list); printf(" MaxTRESPerNode= %s\n", tmp_char); xfree(tmp_char); } if (assoc->max_tres_mins_pj) { + sacctmgr_initialize_g_tres_list(); tmp_char = slurmdb_make_tres_string_from_simple( assoc->max_tres_mins_pj, g_tres_list); printf(" MaxTRESMins = %s\n", tmp_char); xfree(tmp_char); } if (assoc->max_tres_run_mins) { + sacctmgr_initialize_g_tres_list(); tmp_char = slurmdb_make_tres_string_from_simple( assoc->max_tres_run_mins, g_tres_list); printf(" MaxTRESRUNMins= %s\n", tmp_char);