From bebc3dce9328f8103daf29d51aecde3814702ef2 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 15 Apr 2010 19:35:59 +0000
Subject: [PATCH] minor tweak to return zero when asking for CPUs on a node in
error state
---
src/plugins/select/cons_res/select_cons_res.c | 4 +++-
src/plugins/select/linear/select_linear.c | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index 5bff7ef2c7f..2b195310054 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -2018,8 +2018,10 @@ extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
*uint16 = 0;
break;
case SELECT_NODEDATA_SUBCNT:
- if(state == NODE_STATE_ALLOCATED)
+ if (state == NODE_STATE_ALLOCATED)
*uint16 = nodeinfo->alloc_cpus;
+ else
+ *uint16 = 0;
break;
default:
error("Unsupported option %d for get_nodeinfo.", dinfo);
diff --git a/src/plugins/select/linear/select_linear.c b/src/plugins/select/linear/select_linear.c
index 93c2f22cf75..ed51ae46054 100644
--- a/src/plugins/select/linear/select_linear.c
+++ b/src/plugins/select/linear/select_linear.c
@@ -2548,8 +2548,10 @@ extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
*uint16 = 0;
break;
case SELECT_NODEDATA_SUBCNT:
- if(state == NODE_STATE_ALLOCATED)
+ if (state == NODE_STATE_ALLOCATED)
*uint16 = nodeinfo->alloc_cpus;
+ else
+ *uint16 = 0;
break;
default:
error("Unsupported option %d for get_nodeinfo.", dinfo);
--
GitLab