diff --git a/NEWS b/NEWS index 08c0ea4426bd479cdf60202b95c7ff65c3a27872..0bdc0a0877eb530a42887818bdf453e7ed73e02b 100644 --- a/NEWS +++ b/NEWS @@ -30,6 +30,7 @@ documents those changes that are of interest to users and administrators. -- Fix for node's available tres array getting filled in with configured gres model types. -- Log if job --bb option contains any unrecognized content. + -- Display configured and allocated tres for nodes in scontrol show nodes. * Changes in Slurm 17.02.0pre1 ============================== diff --git a/src/api/node_info.c b/src/api/node_info.c index 2db7429c45187d48fc97c548c699b975d3681842..ec69988befd791f9a126caa73cd33022812b4a48 100644 --- a/src/api/node_info.c +++ b/src/api/node_info.c @@ -126,6 +126,7 @@ slurm_sprint_node_table (node_info_t * node_ptr, int idle_cpus; uint32_t cluster_flags = slurmdb_setup_cluster_flags(); uint32_t alloc_memory; + char *node_alloc_tres = NULL; char *line_end = (one_liner) ? " " : "\n "; if (node_scaling) @@ -315,7 +316,17 @@ slurm_sprint_node_table (node_info_t * node_ptr, } else { xstrcat(out, "SlurmdStartTime=None"); } + xstrcat(out, line_end); + /****** TRES Line ******/ + select_g_select_nodeinfo_get(node_ptr->select_nodeinfo, + SELECT_NODEDATA_TRES_ALLOC_FMT_STR, + NODE_STATE_ALLOCATED, &node_alloc_tres); + xstrfmtcat(out, "CfgTRES=%s", node_ptr->tres_fmt_str); + xstrcat(out, line_end); + xstrfmtcat(out, "AllocTRES=%s", + (node_alloc_tres) ? node_alloc_tres : ""); + xfree(node_alloc_tres); xstrcat(out, line_end); /****** Power Management Line ******/