Hi Khanh,
See my comments inline. Best Regards, ThuanTr -----Original Message----- From: Lennart Lund <lennart.l...@ericsson.com> Sent: Monday, August 26, 2019 2:01 PM To: Khanh Hoang Dang <khanh.h.d...@dektech.com.au>; Thuan Tran <thuan.t...@dektech.com.au> Cc: opensaf-devel@lists.sourceforge.net; Khanh Hoang Dang <khanh.h.d...@dektech.com.au>; Lennart Lund <lennart.l...@ericsson.com> Subject: RE: [PATCH 1/1] smf: allow to commit merged camp after a manual cluster reboot [#3063] Hi Khanh, I have not done a thorough review or tested but the reasoning and the solution seems ok. Not contradicting anything in AIS and not NBC, also the new rules are documented (sort of). Let's trust the other reviewers! Thanks Lennart -----Original Message----- From: khanh.h.dang < <mailto:khanh.h.d...@dektech.com.au> khanh.h.d...@dektech.com.au> Sent: den 23 augusti 2019 13:04 To: Lennart Lund < <mailto:lennart.l...@ericsson.com> lennart.l...@ericsson.com>; Thuan Tran < <mailto:thuan.t...@dektech.com.au> thuan.t...@dektech.com.au> Cc: <mailto:opensaf-devel@lists.sourceforge.net> opensaf-devel@lists.sourceforge.net; Khanh Hoang Dang < <mailto:khanh.h.d...@dektech.com.au> 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/SmfUpgradeCampaign.cc | 1 + src/smf/smfd/SmfUpgradeProcedure.cc | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/smf/smfd/SmfUpgradeCampaign.cc b/src/smf/smfd/SmfUpgradeCampaign.cc index 3c50bf7..a50f4da 100644 --- a/src/smf/smfd/SmfUpgradeCampaign.cc +++ b/src/smf/smfd/SmfUpgradeCampaign.cc @@ -903,6 +903,7 @@ void SmfUpgradeCampaign::procResult(SmfUpgradeProcedure *i_procedure, void SmfUpgradeCampaign::continueExec() { TRACE_ENTER(); SaSmfCmpgStateT currentState = m_state->getState(); + SmfCampaignThread::instance()->campaign()->setError(""); [Thuan]: Can we only reset error in new code block (see below comment)? // Check if the campaign execution continues after a campaign restart // resulting from a SMF ordered cluster reboot or SI_SWAP diff --git a/src/smf/smfd/SmfUpgradeProcedure.cc b/src/smf/smfd/SmfUpgradeProcedure.cc index fd99e88..92ae35d 100644 --- a/src/smf/smfd/SmfUpgradeProcedure.cc +++ b/src/smf/smfd/SmfUpgradeProcedure.cc @@ -3382,6 +3382,13 @@ SaAisErrorT SmfUpgradeProcedure::getImmStepsMergedSingleStep() { return SA_AIS_ERR_INIT; } + if (newStep->getState() == SA_SMF_STEP_COMPLETED) { [Thuan]: Can we reset error only code go into this condition? SmfCampaignThread::instance()->campaign()->setError(error); + LOG_NO("SmfUpgradeProcedure::getImmStepsMergedSingleStep: state %d", + SA_SMF_STEP_COMPLETED); [Thuan] Do we need "delete newStep;" here? + 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
