diff options
author | Brian Horton <brianh@linux.ibm.com> | 2014-11-05 07:44:39 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-12-09 11:55:26 -0600 |
commit | 018f537cee42522f6de0fcfc8bd8d56efea7f09f (patch) | |
tree | b25de1542bf4ed68f911987a5bb8721a3f40b216 /src/usr/hwas | |
parent | 5eee371fba7be9298ed9a3f17170d59660d8a92c (diff) | |
download | talos-hostboot-018f537cee42522f6de0fcfc8bd8d56efea7f09f.tar.gz talos-hostboot-018f537cee42522f6de0fcfc8bd8d56efea7f09f.zip |
correct bug in symmetry deconfig processing
replace assert in symmetry deconfig processing if we don't find a
master proc; instead deconfigure all procs on that node to force
it to be deconfigured.
Change-Id: I40b1cf03bbf4c588425117b54d2b414823710e19
CQ: SW284885
Backport: release-fips811
Backport: release-fips820
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14325
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwas')
-rw-r--r-- | src/usr/hwas/common/deconfigGard.C | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/usr/hwas/common/deconfigGard.C b/src/usr/hwas/common/deconfigGard.C index 83d3fdd79..519f89df6 100644 --- a/src/usr/hwas/common/deconfigGard.C +++ b/src/usr/hwas/common/deconfigGard.C @@ -1602,9 +1602,21 @@ errlHndl_t DeconfigGard::_deconfigureAssocProc(ProcInfoVector &io_procInfo) } } // STEP 1 - // If no master proc found, abort - HWAS_ASSERT(l_pMasterProcInfo, "HWAS _deconfigureAssocProc:" - "Master proc not found"); + // If no master proc found, mark all proc as deconfigured + if (l_pMasterProcInfo == NULL) + { + HWAS_INF("deconfigureAssocProc: Master proc not found"); + // Iterate through procs, and mark deconfigured all proc + for (ProcInfoVector::iterator + l_procInfoIter = io_procInfo.begin(); + l_procInfoIter != io_procInfo.end(); + ++l_procInfoIter) + { + (*l_procInfoIter).iv_deconfigured = true; + } + // break now since all of the rest of the processing is moot. + break; + } // STEP 2: // Iterate through procs, and mark deconfigured any |