From 542ead89a5253e95be5f0362b6f975b52a4216f9 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Wed, 24 Feb 2016 09:15:47 -0800
Subject: [PATCH] Properly handle select_g_select_nodeinfo_get() error
Failure has never been observed, but initialize the used variable
before calling the function so we don't re-use old data if the
function returns an error.
---
src/api/node_info.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/api/node_info.c b/src/api/node_info.c
index bede3ee6432..f4e860ed6a7 100644
--- a/src/api/node_info.c
+++ b/src/api/node_info.c
@@ -476,7 +476,6 @@ slurm_sprint_node_table (node_info_t * node_ptr,
static void _set_node_mixed(node_info_msg_t *resp)
{
node_info_t *node_ptr = NULL;
- uint16_t used_cpus = 0;
int i;
if (!resp)
@@ -484,6 +483,7 @@ static void _set_node_mixed(node_info_msg_t *resp)
for (i = 0, node_ptr = resp->node_array;
i < resp->record_count; i++, node_ptr++) {
+ uint16_t used_cpus = 0;
select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED, &used_cpus);
--
GitLab