Ack with minor comments.
1) Missing space after WHILE and IF keywords.
2) A question: why do you not simply compare rc != SA_AIS_OK instead of
checking for all these error codes? Is there some more code excecpt SA_AIS_OK
that signifies success?
+ if ((rc == SA_AIS_ERR_LIBRARY) ||
+ (rc == SA_AIS_ERR_BAD_HANDLE) ||
+ (rc == SA_AIS_ERR_INIT) ||
+ (rc == SA_AIS_ERR_INVALID_PARAM) ||
+ (rc == SA_AIS_ERR_NO_MEMORY) ||
+ (rc == SA_AIS_ERR_NO_RESOURCES) ||
+ (rc == SA_AIS_ERR_BAD_OPERATION) ||
+ (rc == SA_AIS_ERR_NOT_EXIST) ||
+ (rc == SA_AIS_ERR_EXIST) ||
+ (rc == SA_AIS_ERR_UNAVAILABLE)) {
+ LOG_NO("Admin op SA_AMF_ADMIN_SI_SWAP fail [rc = %d]", rc);
+ goto exit_error;
+ }
regards,
Anders Widell
On 09/09/2014 07:15 AM, Ingvar Bergstrom wrote:
> osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc | 112
> +++++++++++++++----
> 1 files changed, 89 insertions(+), 23 deletions(-)
>
>
> smfd handle all possible return codes from the SI_SWAP admin operation.
>
> diff --git a/osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc
> b/osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc
> --- a/osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc
> +++ b/osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc
> @@ -37,6 +37,7 @@
> #include <immutil.h>
> #include <saf_error.h>
> #include "osaf_extended_name.h"
> +#include "osaf_time.h"
>
> #include "stdio.h"
> #include "logtrace.h"
> @@ -3188,38 +3189,103 @@ SmfSwapThread::start(void)
> return 0;
> }
>
> -/**
> +/**
> * SmfSwapThread::main
> * main for the thread.
> */
> -void
> +void
> SmfSwapThread::main(void)
> {
> TRACE_ENTER();
> sem_post(&m_semaphore); //Start method waits for thread to
> start
> + std::string si_name = smfd_cb->smfSiSwapSiName;
> + int max_swap_retry = smfd_cb->smfSiSwapMaxRetry; //Number of retries
> before giving up
> + int retryCnt = 0;
> + int termCnt;
> SmfAdminOperationAction admOp(1);
> - std::string si_name = smfd_cb->smfSiSwapSiName;
> admOp.setDoDn(si_name);
> admOp.setDoId(SA_AMF_ADMIN_SI_SWAP);
> - int max_swap_retry = smfd_cb->smfSiSwapMaxRetry;
> - int retryCnt = 0;
> - int rc;
> - while((rc = admOp.execute(0)) != SA_AIS_OK) {
> - retryCnt++;
> - if(retryCnt > max_swap_retry) {
> - SmfProcStateExecFailed::instance()->changeState(m_proc,
> SmfProcStateExecFailed::instance());
> -
> - LOG_NO("SmfSwapThread::main: SA_AMF_ADMIN_SI_SWAP
> giving up after %d retries", retryCnt);
> - CAMPAIGN_EVT *evt = new CAMPAIGN_EVT();
> - evt->type = CAMPAIGN_EVT_PROCEDURE_RC;
> - evt->event.procResult.rc = SMF_PROC_FAILED;
> - evt->event.procResult.procedure = m_proc;
> - SmfCampaignThread::instance()->send(evt);
> - break;
> - }
> - TRACE("SI_AMF_ADMIN_SI_SWAP, rc=%d, wait 2 seconds and retry",
> rc);
> - sleep(2);
> - }
> -
> + int rc = admOp.execute(0);
> + while((rc == SA_AIS_ERR_TRY_AGAIN) ||
> + (rc == SA_AIS_ERR_BUSY) ||
> + (rc == SA_AIS_ERR_TIMEOUT) ||
> + (rc == SA_AIS_ERR_FAILED_OPERATION)) {
> +
> + if(retryCnt > max_swap_retry) {
> + LOG_NO("SA_AMF_ADMIN_SI_SWAP giving up after %d
> retries", retryCnt);
> + goto exit_error;
> + }
> +
> + if ((rc == SA_AIS_ERR_TIMEOUT) ||
> + (rc == SA_AIS_ERR_FAILED_OPERATION)) {
> + //A timeout or failed operation occur. It is
> undefined if the operation was successful or not.
> + //We wait for maximum two minutes to see if the
> campaign thread is terminated (which it is in a successful swap)
> + //If not terminated, retry the SWAP operation.
> + LOG_NO("SA_AMF_ADMIN_SI_SWAP return
> SA_AIS_ERR_TIMEOUT or SA_AIS_ERR_FAILED_OPERATION [%d]. Wait for
> SmfCampaignThread to die, if not retry", rc);
> + termCnt = 0;
> + while (SmfCampaignThread::instance() != NULL) {
> + if(termCnt >= 60) { //Wait for max 2 minutes
> (60 * 2 sec)
> + LOG_NO("Campaign thread was not
> terminated within 120 seconds after SA_AMF_ADMIN_SI_SWAP, retry SWAP
> operation");
> + break;
> + }
> + struct timespec sleepTime = { 2, 0 };
> + osaf_nanosleep(&sleepTime);
> + termCnt++;
> + }
> + } else { //SA_AIS_ERR_TRY_AGAIN or SA_AIS_ERR_BUSY
> + LOG_NO("SA_AMF_ADMIN_SI_SWAP return
> SA_AIS_ERR_TRY_AGAIN or SA_AIS_ERR_BUSY [%d], wait 2 seconds and retry", rc);
> + struct timespec sleepTime = { 2, 0 };
> + osaf_nanosleep(&sleepTime);
> + }
> +
> + retryCnt++;
> + rc = admOp.execute(0);
> + }
> +
> + if ((rc == SA_AIS_ERR_LIBRARY) ||
> + (rc == SA_AIS_ERR_BAD_HANDLE) ||
> + (rc == SA_AIS_ERR_INIT) ||
> + (rc == SA_AIS_ERR_INVALID_PARAM) ||
> + (rc == SA_AIS_ERR_NO_MEMORY) ||
> + (rc == SA_AIS_ERR_NO_RESOURCES) ||
> + (rc == SA_AIS_ERR_BAD_OPERATION) ||
> + (rc == SA_AIS_ERR_NOT_EXIST) ||
> + (rc == SA_AIS_ERR_EXIST) ||
> + (rc == SA_AIS_ERR_UNAVAILABLE)) {
> + LOG_NO("Admin op SA_AMF_ADMIN_SI_SWAP fail [rc = %d]", rc);
> + goto exit_error;
> + }
> +
> + LOG_NO("SA_AMF_ADMIN_SI_SWAP [rc=%d] successfully initiated", rc);
> +
> + //Wait for the campaign thread to disappear on current node after
> swap
> + termCnt = 0;
> + while (SmfCampaignThread::instance() != NULL) {
> + if(termCnt >= 60) { //Wait for 2 minutes (60 * 2 sec)
> + LOG_NO("Campaign thread does not disappear within
> 120 seconds after SA_AMF_ADMIN_SI_SWAP, the operation was assumed failed.");
> + goto exit_error;
> + }
> + struct timespec sleepTime = { 2, 0 };
> + osaf_nanosleep(&sleepTime);
> + termCnt++;
> + }
> +
> + LOG_NO("Campaign thread terminated after SA_AMF_ADMIN_SI_SWAP");
> + return;
> TRACE_LEAVE();
> +
> +exit_error:
> + if (SmfCampaignThread::instance() != NULL) {
> + SmfProcStateExecFailed::instance()->changeState(m_proc,
> SmfProcStateExecFailed::instance());
> + }
> +
> + if (SmfCampaignThread::instance() != NULL) {
> + CAMPAIGN_EVT *evt = new CAMPAIGN_EVT();
> + evt->type = CAMPAIGN_EVT_PROCEDURE_RC;
> + evt->event.procResult.rc = SMF_PROC_FAILED;
> + evt->event.procResult.procedure = m_proc;
> + SmfCampaignThread::instance()->send(evt);
> + }
> + TRACE_LEAVE();
> + return;
> }
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce.
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
