Hi Khanh,
ACK from me (code review, not test)
Best Regards,
ThuanTr
-----Original Message-----
From: khanh.h.dang <khanh.h.d...@dektech.com.au>
Sent: Monday, August 26, 2019 6:02 PM
To: lennart.l...@ericsson.com; thuan.t...@dektech.com.au
Cc: opensaf-devel@lists.sourceforge.net; khanh.h.dang
<khanh.h.d...@dektech.com.au>
Subject: [PATCH 1/1] smf: allow to commit merged camp after a manual cluster
reboot [#3063]
Return OK to immSteps if step is already completed in order to continue
executing after a manual cluster reboot.
---
src/smf/smfd/SmfUpgradeProcedure.cc | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/smf/smfd/SmfUpgradeProcedure.cc
b/src/smf/smfd/SmfUpgradeProcedure.cc
index fd99e88..dfe9853 100644
--- a/src/smf/smfd/SmfUpgradeProcedure.cc
+++ b/src/smf/smfd/SmfUpgradeProcedure.cc
@@ -3382,6 +3382,15 @@ SaAisErrorT
SmfUpgradeProcedure::getImmStepsMergedSingleStep() {
return SA_AIS_ERR_INIT;
}
+ if (newStep->getState() == SA_SMF_STEP_COMPLETED) {
+ SmfCampaignThread::instance()->campaign()->setError("");
+ LOG_NO("SmfUpgradeProcedure::getImmStepsMergedSingleStep: State %d",
+ SA_SMF_STEP_COMPLETED);
+ delete newStep;
+ TRACE_LEAVE();
+ return SA_AIS_OK;
+ }
+
if ((newStep->getState() != SA_SMF_STEP_INITIAL) &&
(newStep->getState() != SA_SMF_STEP_EXECUTING)) {
LOG_NO("SmfUpgradeProcedure::getImmStepsMergedSingleStep: Invalid state
%d",
--
2.7.4
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
