Re: [devel] [PATCH 1 of 1] amfd: fix incorrect ER messages in sg_2n_fsm.cc [#1897]

[Long Nguyen]

Hi Praveen,

Very sorry. I somehow missed the mail. I have found your mail now. 
Thanks so much.

Best regards,
Long Nguyen.

On 10/18/2016 2:01 PM, praveen malviya wrote:
> Hi Long,
>
> I had already acked it on 14th Oct.
>
>
> Thanks,
> Praveen
>
> On 18-Oct-16 12:28 PM, Long Nguyen wrote:
>> Hi Praveen and Nagu,
>>
>> Did you have a chance to look at the patch?
>>
>> Best regards,
>> Long Nguyen.
>>
>> On 10/10/2016 11:27 AM, Gary Lee wrote:
>>> Hi Long
>>>
>>> ack
>>>
>>> Thanks
>>>
 On 10 Oct. 2016, at 3:26 pm, Long HB Nguyen
  wrote:

 osaf/services/saf/amf/amfd/sg_2n_fsm.cc |  10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)


 diff --git a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
 b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
 --- a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
 +++ b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
 @@ -745,21 +745,21 @@ SaAisErrorT SG_2N::si_swap(AVD_SI *si, S
 TRACE_ENTER2("'%s' sg_fsm_state=%u", si->name.c_str(),
 si->sg_of_si->sg_fsm_state);

 if (si->saAmfSIAdminState != SA_AMF_ADMIN_UNLOCKED) {
 -LOG_ER("%s SWAP failed - wrong admin state=%u",
 si->name.c_str(),
 +LOG_NO("%s SWAP failed - wrong admin state=%u",
 si->name.c_str(),
 si->saAmfSIAdminState);
 rc = SA_AIS_ERR_TRY_AGAIN;
 goto done;
 }

 if (avd_cb->init_state != AVD_APP_STATE) {
 -LOG_ER("%s SWAP failed - not in app state (%u)",
 si->name.c_str(),
 +LOG_NO("%s SWAP failed - not in app state (%u)",
 si->name.c_str(),
 avd_cb->init_state);
 rc = SA_AIS_ERR_TRY_AGAIN;
 goto done;
 }

 if (si->sg_of_si->sg_fsm_state != AVD_SG_FSM_STABLE) {
 -LOG_ER("%s SWAP failed - SG not stable (%u)", 
 si->name.c_str(),
 +LOG_NO("%s SWAP failed - SG not stable (%u)", 
 si->name.c_str(),
 si->sg_of_si->sg_fsm_state);
 rc = SA_AIS_ERR_TRY_AGAIN;
 goto done;
 @@ -774,14 +774,14 @@ SaAisErrorT SG_2N::si_swap(AVD_SI *si, S
 if ((si->sg_of_si->sg_ncs_spec) &&
 ((avd_cb->node_id_avd_other != 0) &&
 (avd_cb->other_avd_adest != 0))) {
 if (avd_cb->stby_sync_state == AVD_STBY_OUT_OF_SYNC) {
 -LOG_ER("%s SWAP failed - Cold sync in progress",
 si->name.c_str());
 +LOG_NO("%s SWAP failed - Cold sync in progress",
 si->name.c_str());
 rc = SA_AIS_ERR_TRY_AGAIN;
 goto done;
 }
 }

 if (si->list_of_sisu->si_next == nullptr) {
 -LOG_ER("%s SWAP failed - only one assignment",
 si->name.c_str());
 +LOG_NO("%s SWAP failed - only one assignment",
 si->name.c_str());
 rc = SA_AIS_ERR_TRY_AGAIN;
 goto done;
 }
>>>
>>
>


--
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

Re: [devel] [PATCH 1 of 1] amfd: fix incorrect ER messages in sg_2n_fsm.cc [#1897]

[praveen malviya]

Hi Long,

I had already acked it on 14th Oct.


Thanks,
Praveen

On 18-Oct-16 12:28 PM, Long Nguyen wrote:
> Hi Praveen and Nagu,
>
> Did you have a chance to look at the patch?
>
> Best regards,
> Long Nguyen.
>
> On 10/10/2016 11:27 AM, Gary Lee wrote:
>> Hi Long
>>
>> ack
>>
>> Thanks
>>
>>> On 10 Oct. 2016, at 3:26 pm, Long HB Nguyen
>>>  wrote:
>>>
>>> osaf/services/saf/amf/amfd/sg_2n_fsm.cc |  10 +-
>>> 1 files changed, 5 insertions(+), 5 deletions(-)
>>>
>>>
>>> diff --git a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
>>> b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
>>> --- a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
>>> +++ b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
>>> @@ -745,21 +745,21 @@ SaAisErrorT SG_2N::si_swap(AVD_SI *si, S
>>> TRACE_ENTER2("'%s' sg_fsm_state=%u", si->name.c_str(),
>>> si->sg_of_si->sg_fsm_state);
>>>
>>> if (si->saAmfSIAdminState != SA_AMF_ADMIN_UNLOCKED) {
>>> -LOG_ER("%s SWAP failed - wrong admin state=%u",
>>> si->name.c_str(),
>>> +LOG_NO("%s SWAP failed - wrong admin state=%u",
>>> si->name.c_str(),
>>> si->saAmfSIAdminState);
>>> rc = SA_AIS_ERR_TRY_AGAIN;
>>> goto done;
>>> }
>>>
>>> if (avd_cb->init_state != AVD_APP_STATE) {
>>> -LOG_ER("%s SWAP failed - not in app state (%u)",
>>> si->name.c_str(),
>>> +LOG_NO("%s SWAP failed - not in app state (%u)",
>>> si->name.c_str(),
>>> avd_cb->init_state);
>>> rc = SA_AIS_ERR_TRY_AGAIN;
>>> goto done;
>>> }
>>>
>>> if (si->sg_of_si->sg_fsm_state != AVD_SG_FSM_STABLE) {
>>> -LOG_ER("%s SWAP failed - SG not stable (%u)", si->name.c_str(),
>>> +LOG_NO("%s SWAP failed - SG not stable (%u)", si->name.c_str(),
>>> si->sg_of_si->sg_fsm_state);
>>> rc = SA_AIS_ERR_TRY_AGAIN;
>>> goto done;
>>> @@ -774,14 +774,14 @@ SaAisErrorT SG_2N::si_swap(AVD_SI *si, S
>>> if ((si->sg_of_si->sg_ncs_spec) &&
>>> ((avd_cb->node_id_avd_other != 0) &&
>>> (avd_cb->other_avd_adest != 0))) {
>>> if (avd_cb->stby_sync_state == AVD_STBY_OUT_OF_SYNC) {
>>> -LOG_ER("%s SWAP failed - Cold sync in progress",
>>> si->name.c_str());
>>> +LOG_NO("%s SWAP failed - Cold sync in progress",
>>> si->name.c_str());
>>> rc = SA_AIS_ERR_TRY_AGAIN;
>>> goto done;
>>> }
>>> }
>>>
>>> if (si->list_of_sisu->si_next == nullptr) {
>>> -LOG_ER("%s SWAP failed - only one assignment",
>>> si->name.c_str());
>>> +LOG_NO("%s SWAP failed - only one assignment",
>>> si->name.c_str());
>>> rc = SA_AIS_ERR_TRY_AGAIN;
>>> goto done;
>>> }
>>
>

--
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

Re: [devel] [PATCH 1 of 1] amfd: fix incorrect ER messages in sg_2n_fsm.cc [#1897]

[Long Nguyen]

Hi Praveen and Nagu,

Did you have a chance to look at the patch?

Best regards,
Long Nguyen.

On 10/10/2016 11:27 AM, Gary Lee wrote:
> Hi Long
>
> ack
>
> Thanks
>
>> On 10 Oct. 2016, at 3:26 pm, Long HB Nguyen  
>> wrote:
>>
>> osaf/services/saf/amf/amfd/sg_2n_fsm.cc |  10 +-
>> 1 files changed, 5 insertions(+), 5 deletions(-)
>>
>>
>> diff --git a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc 
>> b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
>> --- a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
>> +++ b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
>> @@ -745,21 +745,21 @@ SaAisErrorT SG_2N::si_swap(AVD_SI *si, S
>>  TRACE_ENTER2("'%s' sg_fsm_state=%u", si->name.c_str(), 
>> si->sg_of_si->sg_fsm_state);
>>
>>  if (si->saAmfSIAdminState != SA_AMF_ADMIN_UNLOCKED) {
>> -LOG_ER("%s SWAP failed - wrong admin state=%u", 
>> si->name.c_str(),
>> +LOG_NO("%s SWAP failed - wrong admin state=%u", 
>> si->name.c_str(),
>>  si->saAmfSIAdminState);
>>  rc = SA_AIS_ERR_TRY_AGAIN;
>>  goto done;
>>  }
>>
>>  if (avd_cb->init_state != AVD_APP_STATE) {
>> -LOG_ER("%s SWAP failed - not in app state (%u)", 
>> si->name.c_str(),
>> +LOG_NO("%s SWAP failed - not in app state (%u)", 
>> si->name.c_str(),
>>  avd_cb->init_state);
>>  rc = SA_AIS_ERR_TRY_AGAIN;
>>  goto done;
>>  }
>>
>>  if (si->sg_of_si->sg_fsm_state != AVD_SG_FSM_STABLE) {
>> -LOG_ER("%s SWAP failed - SG not stable (%u)", si->name.c_str(),
>> +LOG_NO("%s SWAP failed - SG not stable (%u)", si->name.c_str(),
>>  si->sg_of_si->sg_fsm_state);
>>  rc = SA_AIS_ERR_TRY_AGAIN;
>>  goto done;
>> @@ -774,14 +774,14 @@ SaAisErrorT SG_2N::si_swap(AVD_SI *si, S
>>  if ((si->sg_of_si->sg_ncs_spec) &&
>>  ((avd_cb->node_id_avd_other != 0) && 
>> (avd_cb->other_avd_adest != 0))) {
>>  if (avd_cb->stby_sync_state == AVD_STBY_OUT_OF_SYNC) {
>> -LOG_ER("%s SWAP failed - Cold sync in progress", 
>> si->name.c_str());
>> +LOG_NO("%s SWAP failed - Cold sync in progress", 
>> si->name.c_str());
>>  rc = SA_AIS_ERR_TRY_AGAIN;
>>  goto done;
>>  }
>>  }
>>
>>  if (si->list_of_sisu->si_next == nullptr) {
>> -LOG_ER("%s SWAP failed - only one assignment", 
>> si->name.c_str());
>> +LOG_NO("%s SWAP failed - only one assignment", 
>> si->name.c_str());
>>  rc = SA_AIS_ERR_TRY_AGAIN;
>>  goto done;
>>  }
>


--
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

Re: [devel] [PATCH 1 of 1] amfd: fix incorrect ER messages in sg_2n_fsm.cc [#1897]

[praveen malviya]

Ack, code review only.

one minor comment.

Thanks
Praveen

On 10-Oct-16 9:56 AM, Long HB Nguyen wrote:
>  osaf/services/saf/amf/amfd/sg_2n_fsm.cc |  10 +-
>  1 files changed, 5 insertions(+), 5 deletions(-)
>
>
> diff --git a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc 
> b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> --- a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> +++ b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> @@ -745,21 +745,21 @@ SaAisErrorT SG_2N::si_swap(AVD_SI *si, S
>   TRACE_ENTER2("'%s' sg_fsm_state=%u", si->name.c_str(), 
> si->sg_of_si->sg_fsm_state);
>
>   if (si->saAmfSIAdminState != SA_AMF_ADMIN_UNLOCKED) {
> - LOG_ER("%s SWAP failed - wrong admin state=%u", 
> si->name.c_str(),
> + LOG_NO("%s SWAP failed - wrong admin state=%u", 
> si->name.c_str(),
>   si->saAmfSIAdminState);
>   rc = SA_AIS_ERR_TRY_AGAIN;
>   goto done;
[Praveen] I think AMFD should not return TRY_AGAIN in this case. Since 
SI is locked, si_swap will not be successful in any no. of tries. I 
think there is already some ticket for this.
>   }
>
>   if (avd_cb->init_state != AVD_APP_STATE) {
> - LOG_ER("%s SWAP failed - not in app state (%u)", 
> si->name.c_str(),
> + LOG_NO("%s SWAP failed - not in app state (%u)", 
> si->name.c_str(),
>   avd_cb->init_state);
>   rc = SA_AIS_ERR_TRY_AGAIN;
>   goto done;
>   }
>
>   if (si->sg_of_si->sg_fsm_state != AVD_SG_FSM_STABLE) {
> - LOG_ER("%s SWAP failed - SG not stable (%u)", si->name.c_str(),
> + LOG_NO("%s SWAP failed - SG not stable (%u)", si->name.c_str(),
>   si->sg_of_si->sg_fsm_state);
>   rc = SA_AIS_ERR_TRY_AGAIN;
>   goto done;
> @@ -774,14 +774,14 @@ SaAisErrorT SG_2N::si_swap(AVD_SI *si, S
>   if ((si->sg_of_si->sg_ncs_spec) &&
>   ((avd_cb->node_id_avd_other != 0) && 
> (avd_cb->other_avd_adest != 0))) {
>   if (avd_cb->stby_sync_state == AVD_STBY_OUT_OF_SYNC) {
> - LOG_ER("%s SWAP failed - Cold sync in progress", 
> si->name.c_str());
> + LOG_NO("%s SWAP failed - Cold sync in progress", 
> si->name.c_str());
>   rc = SA_AIS_ERR_TRY_AGAIN;
>   goto done;
>   }
>   }
>
>   if (si->list_of_sisu->si_next == nullptr) {
> - LOG_ER("%s SWAP failed - only one assignment", 
> si->name.c_str());
> + LOG_NO("%s SWAP failed - only one assignment", 
> si->name.c_str());
>   rc = SA_AIS_ERR_TRY_AGAIN;
>   goto done;
>   }
>

--
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

Re: [devel] [PATCH 1 of 1] amfd: fix incorrect ER messages in sg_2n_fsm.cc [#1897]

[Gary Lee]

Hi Long

ack

Thanks

> On 10 Oct. 2016, at 3:26 pm, Long HB Nguyen  
> wrote:
> 
> osaf/services/saf/amf/amfd/sg_2n_fsm.cc |  10 +-
> 1 files changed, 5 insertions(+), 5 deletions(-)
> 
> 
> diff --git a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc 
> b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> --- a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> +++ b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> @@ -745,21 +745,21 @@ SaAisErrorT SG_2N::si_swap(AVD_SI *si, S
>   TRACE_ENTER2("'%s' sg_fsm_state=%u", si->name.c_str(), 
> si->sg_of_si->sg_fsm_state);
> 
>   if (si->saAmfSIAdminState != SA_AMF_ADMIN_UNLOCKED) {
> - LOG_ER("%s SWAP failed - wrong admin state=%u", 
> si->name.c_str(),
> + LOG_NO("%s SWAP failed - wrong admin state=%u", 
> si->name.c_str(),
>   si->saAmfSIAdminState);
>   rc = SA_AIS_ERR_TRY_AGAIN;
>   goto done;
>   }
> 
>   if (avd_cb->init_state != AVD_APP_STATE) {
> - LOG_ER("%s SWAP failed - not in app state (%u)", 
> si->name.c_str(),
> + LOG_NO("%s SWAP failed - not in app state (%u)", 
> si->name.c_str(),
>   avd_cb->init_state);
>   rc = SA_AIS_ERR_TRY_AGAIN;
>   goto done;
>   }
> 
>   if (si->sg_of_si->sg_fsm_state != AVD_SG_FSM_STABLE) {
> - LOG_ER("%s SWAP failed - SG not stable (%u)", si->name.c_str(),
> + LOG_NO("%s SWAP failed - SG not stable (%u)", si->name.c_str(),
>   si->sg_of_si->sg_fsm_state);
>   rc = SA_AIS_ERR_TRY_AGAIN;
>   goto done;
> @@ -774,14 +774,14 @@ SaAisErrorT SG_2N::si_swap(AVD_SI *si, S
>   if ((si->sg_of_si->sg_ncs_spec) && 
>   ((avd_cb->node_id_avd_other != 0) && 
> (avd_cb->other_avd_adest != 0))) {
>   if (avd_cb->stby_sync_state == AVD_STBY_OUT_OF_SYNC) {
> - LOG_ER("%s SWAP failed - Cold sync in progress", 
> si->name.c_str());
> + LOG_NO("%s SWAP failed - Cold sync in progress", 
> si->name.c_str());
>   rc = SA_AIS_ERR_TRY_AGAIN;
>   goto done;
>   }
>   }
> 
>   if (si->list_of_sisu->si_next == nullptr) {
> - LOG_ER("%s SWAP failed - only one assignment", 
> si->name.c_str());
> + LOG_NO("%s SWAP failed - only one assignment", 
> si->name.c_str());
>   rc = SA_AIS_ERR_TRY_AGAIN;
>   goto done;
>   }


--
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