Hi Phuc,
ACK from me.
Best Regards,
ThuanTr
-----Original Message-----
From: phuc.h.chau <phuc.h.c...@dektech.com.au>
Sent: Thursday, October 24, 2019 10:28 AM
To: lennart.l...@ericsson.com; thuan.t...@dektech.com.au;
thang.d.ngu...@dektech.com.au; minh.c...@dektech.com.au;
gary....@dektech.com.au
Cc: opensaf-devel@lists.sourceforge.net; phuc.h.chau
<phuc.h.c...@dektech.com.au>
Subject: [PATCH 1/1] smf: Improve SmfAdminStateHandler() Return false if
Fail [#3104]
SW upgrade testing, if found that if a service unit is in
INSTANTIATION_FAILED,
one_step upgrade will not continue with the software installation.
---
src/smf/smfd/SmfAdminState.cc | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
mode change 100644 => 100755 src/smf/smfd/SmfAdminState.cc
diff --git a/src/smf/smfd/SmfAdminState.cc b/src/smf/smfd/SmfAdminState.cc
old mode 100644
new mode 100755
index 076f9f0..4730215
--- a/src/smf/smfd/SmfAdminState.cc
+++ b/src/smf/smfd/SmfAdminState.cc
@@ -858,7 +858,7 @@ bool SmfAdminStateHandler::deleteNodeGroup() {
bool SmfAdminStateHandler::nodeGroupAdminOperation(
SaAmfAdminOperationIdT adminOp) {
- bool method_rc = true;
+ bool method_rc = false;
TRACE_ENTER();
@@ -920,20 +920,17 @@ bool SmfAdminStateHandler::nodeGroupAdminOperation(
} else if (imm_rc != SA_AIS_OK) {
LOG_NO("%s adminOpTimeout Fail %s", __FUNCTION__,
saf_error(imm_rc));
errno_ = imm_rc;
- method_rc = false;
} else {
LOG_NO("%s adminOpTimeout Fail %s", __FUNCTION__,
saf_error(oi_rc));
errno_ = oi_rc;
- method_rc = false;
}
}
} else {
LOG_NO("%s: becomeAdminOwnerOf(%s) Fail", __FUNCTION__,
nodeGroupName_s.c_str());
- method_rc = false;
}
- if (method_rc == true) {
+ if (admset_rc == true) {
TRACE("%s Admin operation is done. Release ownership if nodegroup",
__FUNCTION__);
if (releaseAdminOwnerOf(nodeGroupName_s) == false) {
--
2.7.4
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
