When applying a CCB fail the return code is SA_AIS_ERR_FAILED_OPERATION.
There is a number of reasons for this return code. Add logging of the reason.
Also add logging if failing to delete a node group where the return code is
othervise ignored.
---
src/smf/smfd/SmfAdminState.cc | 6 +++++-
src/smf/smfd/imm_modify_config/add_operation_to_ccb.cc | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/smf/smfd/SmfAdminState.cc b/src/smf/smfd/SmfAdminState.cc
index 950844766..6292e165c 100644
--- a/src/smf/smfd/SmfAdminState.cc
+++ b/src/smf/smfd/SmfAdminState.cc
@@ -558,7 +558,11 @@ bool SmfAdminStateHandler::adminOperationNodeGroup(
LOG_NO("%s: setNodeGroupAdminState() Fail %s", __FUNCTION__,
saf_error(ais_errno));
}
- (void)deleteNodeGroup();
+ if (deleteNodeGroup() == false) {
+ LOG_NO("%s: deleteNodeGroup(), Fail. "
+ "Changing state did not fail. %s Return code is not set to Fail",
+ __FUNCTION__, __FUNCTION__);
+ }
}
} else {
TRACE("\t m_nodelist is empty!");
diff --git a/src/smf/smfd/imm_modify_config/add_operation_to_ccb.cc
b/src/smf/smfd/imm_modify_config/add_operation_to_ccb.cc
index 082dd81c5..051d76775 100644
--- a/src/smf/smfd/imm_modify_config/add_operation_to_ccb.cc
+++ b/src/smf/smfd/imm_modify_config/add_operation_to_ccb.cc
@@ -56,7 +56,7 @@ bool IsResorceAbort(const SaImmCcbHandleT& ccbHandle) {
const SaStringT *errString = nullptr;
SaAisErrorT ais_rc = saImmOmCcbGetErrorStrings(ccbHandle, &errString);
if ((ais_rc == SA_AIS_OK) && (errString != nullptr)) {
- TRACE("%s: Error string: '%s'", __FUNCTION__, errString[0]);
+ LOG_NO("%s: Error string: '%s'", __FUNCTION__, errString[0]);
std::string err_str(errString[0]);
if (err_str.find("IMM: Resource abort: ") != std::string::npos) {
// Is Resource Abort
--
2.16.2
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
