From 96aa468a7e6a5013dd8149a2ecab7e618b2b02a9 Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 26 Jun 2018 11:34:57 -0500 Subject: Fix for assert in hbrt on two node fleetwood -A change went in recently to fix the hbrt attribute resource provider and targeting code so that it would not depend on node zero being in the configuration. That change introduced a bug in two node systems where the targeting code fails to initalize properly if the single node in the system is not node zero. Change-Id: Ibe2529ac3279a2a4346becd6757736f2d8ad5051 CQ:SW435007 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61415 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Christian R. Geddes Reviewed-by: Richard Ward Reviewed-by: William G. Hoffa Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61659 --- src/usr/targeting/runtime/attrrp_rt.C | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/usr/targeting/runtime') diff --git a/src/usr/targeting/runtime/attrrp_rt.C b/src/usr/targeting/runtime/attrrp_rt.C index 5227f3f83..33d759ad5 100644 --- a/src/usr/targeting/runtime/attrrp_rt.C +++ b/src/usr/targeting/runtime/attrrp_rt.C @@ -134,17 +134,17 @@ namespace TARGETING ++l_node; } // while } - else // Single-node system + else // Single-node system, hb_images will be zero, but the + // variable, i_instance, will be equal to the node id + // of the only functional node in the system, and will + // not always be node zero { - // Check if current node is the node of interest - if(l_node == i_instance) - { - // Flag that input instance is a valid node - l_validNode = true; - } + // Flag that input instance is a valid node + l_validNode = true; - // Replace maximum node ID - io_maxNodeId = l_node; + // Replace maximum node ID with + // this nodes instance id + io_maxNodeId = i_instance; } // Input instance is not a valid node -- cgit v1.2.3