Hi Nagu,
Can you please apply the below patch on top of
1725_02_V2_bugfix_resend_buffer_in_set_leds.diff?
In your test, PL3 get set_leds, but PL-4 has not, so SU2 can not respond
su_si msg.
@Praveen: Thanks for you help, I guess SU2 need to be ready to send
su_si msg at the same as SU1.
diff --git a/osaf/services/saf/amf/amfd/ndfsm.cc
b/osaf/services/saf/amf/amfd/ndfsm.cc
--- a/osaf/services/saf/amf/amfd/ndfsm.cc
+++ b/osaf/services/saf/amf/amfd/ndfsm.cc
@@ -315,6 +315,9 @@ void avd_node_up_evh(AVD_CL_CB *cb, AVD_
cb->all_nodes_synced = true;
LOG_NO("Received node_up_msg from all nodes");
} else {
+ if (n2d_msg->msg_info.n2d_node_up.leds_set == true)
+ avnd->veteran = true;
+
if (avnd->node_up_msg_count == 1 &&
(act_nd ||
n2d_msg->msg_info.n2d_node_up.leds_set)) {
@@ -415,7 +418,6 @@ void avd_node_up_evh(AVD_CL_CB *cb, AVD_
// this node is already up
avd_node_state_set(avnd, AVD_AVND_STATE_PRESENT);
avd_node_oper_state_set(avnd,
SA_AMF_OPERATIONAL_ENABLED);
- avnd->veteran = true;
// Update readiness state of all SUs which are
waiting for node
// oper state
for (const auto& su : avnd->list_of_ncs_su) {
On 24/08/16 22:05, praveen malviya wrote:
> Hi Minh,
>
> Any assignment message should be processed after cluster timer expiry
> and node sync timer expiry. The bug fix patch
> 1725_02_V2_bugfix_resend_buffer_in_set_leds.diff honors cluster timer
> expiry but not node sync timer.
> After node sync timer expiry, delayed payloads will be rebooted and if
> these payloads host any SU/SUSIs, they will be deleted. So admin op
> will finish gracefully.
> I think for loop can be added in both timers' expiry events with a
> check on exipry of other timer:
>
> diff --git a/osaf/services/saf/amf/amfd/cluster.cc
> b/osaf/services/saf/amf/amfd/cluster.cc
> --- a/osaf/services/saf/amf/amfd/cluster.cc
> +++ b/osaf/services/saf/amf/amfd/cluster.cc
> @@ -74,12 +74,13 @@ void avd_cluster_tmr_init_evh(AVD_CL_CB
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(cb, cb,
> AVSV_CKPT_AVD_CB_CONFIG);
>
> // Resend set_leds to veteran node
> -
> - for (std::map<std::string, AVD_AVND *>::const_iterator it =
> node_name_db->begin();
> - it != node_name_db->end(); it++) {
> - node = it->second;
> - if (node->veteran)
> - avd_snd_set_leds_msg(cb, node);
> + if (cb->node_sync_tmr.is_active == false) {
> + for (std::map<std::string, AVD_AVND *>::const_iterator
> it = node_name_db->begin();
> + it != node_name_db->end(); it++) {
> + node = it->second;
> + if (node->veteran)
> + avd_snd_set_leds_msg(cb, node);
> + }
> }
>
> /* call the realignment routine for each of the SGs in the
> @@ -143,6 +144,17 @@ void avd_node_sync_tmr_evh(AVD_CL_CB *cb
> // Setting true here to indicate the node sync window has closed
> // Further node up message will be treated specially
> cb->node_sync_window_closed = true;
> + // Resend set_leds to veteran node
> + if (cb->amf_init_tmr.is_active == false) {
> + AVD_AVND *node = nullptr;
> + for (std::map<std::string, AVD_AVND
> *>::const_iterator it = node_name_db->begin();
> + it != node_name_db->end(); it++) {
> + node = it->second;
> + if (node->veteran)
> + avd_snd_set_leds_msg(cb, node);
> + }
> + }
> +
>
> TRACE_LEAVE();
> }
>
>
>
> Thanks,
> Praveen
> On 24-Aug-16 4:58 PM, Nagendra Kumar wrote:
>> The below is the assignments after the test case (SU2 has standby
>> assignment):
>>
>> PM_SC-1:/home/nagu/views/staging-1725 # /etc/init.d/opensafd status
>> safSISU=safSu=SU2\,safSg=AmfDemo_2N\,safApp=AmfDemo1,safSi=AmfDemo1,safApp=AmfDemo1
>>
>>
>> saAmfSISUHAState=STANDBY(2)
>> safSISU=safSu=PL-3\,safSg=NoRed\,safApp=OpenSAF,safSi=NoRed3,safApp=OpenSAF
>>
>> saAmfSISUHAState=ACTIVE(1)
>> safSISU=safSu=PL-4\,safSg=NoRed\,safApp=OpenSAF,safSi=NoRed2,safApp=OpenSAF
>>
>> saAmfSISUHAState=ACTIVE(1)
>> safSISU=safSu=SC-2\,safSg=NoRed\,safApp=OpenSAF,safSi=NoRed4,safApp=OpenSAF
>>
>> saAmfSISUHAState=ACTIVE(1)
>> safSISU=safSu=SC-1\,safSg=NoRed\,safApp=OpenSAF,safSi=NoRed1,safApp=OpenSAF
>>
>> saAmfSISUHAState=ACTIVE(1)
>> safSISU=safSu=SC-2\,safSg=2N\,safApp=OpenSAF,safSi=SC-2N,safApp=OpenSAF
>> saAmfSISUHAState=STANDBY(2)
>> safSISU=safSu=SC-1\,safSg=2N\,safApp=OpenSAF,safSi=SC-2N,safApp=OpenSAF
>> saAmfSISUHAState=ACTIVE(1)
>>
>> Thanks
>> -Nagu
>>
>>> -----Original Message-----
>>> From: Nagendra Kumar
>>> Sent: 24 August 2016 16:55
>>> To: Minh Hon Chau; hans.nordeb...@ericsson.com; Praveen Malviya;
>>> gary....@dektech.com.au; long.hb.ngu...@dektech.com.au
>>> Cc: opensaf-devel@lists.sourceforge.net
>>> Subject: Re: [devel] [PATCH 2 of 2] AMFND: Admin operation
>>> continuation if
>>> csi callback completes during headless [#1725 part 1] V1
>>>
>>> Hi Minh,
>>> With 1725_phase_1_V2.tgz, the below email TC has failed. Please
>>> find the traces attached along with the configuration in the ticket.
>>>
>>> Thanks
>>> -Nagu
>>>
>>>> -----Original Message-----
>>>> From: Nagendra Kumar
>>>> Sent: 23 August 2016 15:15
>>>> To: Minh Hon Chau; hans.nordeb...@ericsson.com; Praveen Malviya;
>>>> gary....@dektech.com.au; long.hb.ngu...@dektech.com.au
>>>> Cc: opensaf-devel@lists.sourceforge.net
>>>> Subject: Re: [devel] [PATCH 2 of 2] AMFND: Admin operation
>>>> continuation if csi callback completes during headless [#1725 part 1]
>>>> V1
>>>>
>>>> Hi Minh,
>>>> The following SU lock case is not working. This issue will
>>>> exist for
>>>> all the flows, so please check.
>>>>
>>>> Configuration and traces attached in the ticket.
>>>>
>>>> Steps:
>>>> 1. Start SC-1, SC-2, PL-3 and PL-4. Run the following command:
>>>> immcfg -f /tmp/AppConfig-2N-1725.xml
>>>> amf-adm unlock-in safSu=SU1,safSg=AmfDemo_2N,safApp=AmfDemo1
>>>> amf-adm unlock-in safSu=SU2,safSg=AmfDemo_2N,safApp=AmfDemo1
>>>> amf-adm unlock-in safSu=SU3,safSg=AmfDemo_2N,safApp=AmfDemo1
>>>> amf-adm unlock safSu=SU1,safSg=AmfDemo_2N,safApp=AmfDemo1
>>>> amf-adm unlock safSu=SU2,safSg=AmfDemo_2N,safApp=AmfDemo1
>>>> amf-adm unlock safSu=SU3,safSg=AmfDemo_2N,safApp=AmfDemo1
>>>>
>>>> Assignments are:
>>>> PM_SC-1:/home/nagu/views/staging-1725 # /etc/init.d/opensafd status
>>>> safSISU=safSu=SC-
>>>> 1\,safSg=NoRed\,safApp=OpenSAF,safSi=NoRed1,safApp=OpenSAF
>>>> saAmfSISUHAState=ACTIVE(1)
>>>> safSISU=safSu=SC-1\,safSg=2N\,safApp=OpenSAF,safSi=SC-
>>>> 2N,safApp=OpenSAF
>>>> saAmfSISUHAState=ACTIVE(1)
>>>> safSISU=safSu=SC-
>>>> 2\,safSg=NoRed\,safApp=OpenSAF,safSi=NoRed2,safApp=OpenSAF
>>>> saAmfSISUHAState=ACTIVE(1)
>>>> safSISU=safSu=SC-2\,safSg=2N\,safApp=OpenSAF,safSi=SC-
>>>> 2N,safApp=OpenSAF
>>>> saAmfSISUHAState=STANDBY(2)
>>>> safSISU=safSu=PL-
>>>> 4\,safSg=NoRed\,safApp=OpenSAF,safSi=NoRed3,safApp=OpenSAF
>>>> saAmfSISUHAState=ACTIVE(1)
>>>> safSISU=safSu=PL-
>>>> 3\,safSg=NoRed\,safApp=OpenSAF,safSi=NoRed4,safApp=OpenSAF
>>>> saAmfSISUHAState=ACTIVE(1)
>>>>
>>> safSISU=safSu=SU2\,safSg=AmfDemo_2N\,safApp=AmfDemo1,safSi=AmfDe
>>>> mo1,safApp=AmfDemo1
>>>> saAmfSISUHAState=STANDBY(2)
>>>>
>>> safSISU=safSu=SU1\,safSg=AmfDemo_2N\,safApp=AmfDemo1,safSi=AmfDe
>>>> mo1,safApp=AmfDemo1
>>>> saAmfSISUHAState=ACTIVE(1)
>>>>
>>>> 2. Issue lock on SU1.
>>>> amf-adm lock safSu=SU1,safSg=AmfDemo_2N,safApp=AmfDemo1
>>>> And keep gdb in csi_set callback. Stop SC-1 and SC-2.
>>>> Send Ok from csi_set callback.
>>>>
>>>> 3. Start SC-1 and SC-2.
>>>>
>>>> 4. Assignment to components of SU2 is not given and assignments of SU2
>>>> still shows Standby.
>>>> PM_SC-1:/home/nagu/views/staging-1725 # /etc/init.d/opensafd status
>>>>
>>> safSISU=safSu=SU2\,safSg=AmfDemo_2N\,safApp=AmfDemo1,safSi=AmfDe
>>>> mo1,safApp=AmfDemo1
>>>> saAmfSISUHAState=STANDBY(2)
>>>> safSISU=safSu=SC-2\,safSg=2N\,safApp=OpenSAF,safSi=SC-
>>>> 2N,safApp=OpenSAF
>>>> saAmfSISUHAState=STANDBY(2)
>>>> safSISU=safSu=SC-
>>>> 1\,safSg=NoRed\,safApp=OpenSAF,safSi=NoRed1,safApp=OpenSAF
>>>> saAmfSISUHAState=ACTIVE(1)
>>>> safSISU=safSu=PL-
>>>> 4\,safSg=NoRed\,safApp=OpenSAF,safSi=NoRed3,safApp=OpenSAF
>>>> saAmfSISUHAState=ACTIVE(1)
>>>> safSISU=safSu=PL-
>>>> 3\,safSg=NoRed\,safApp=OpenSAF,safSi=NoRed2,safApp=OpenSAF
>>>> saAmfSISUHAState=ACTIVE(1)
>>>> safSISU=safSu=SC-
>>>> 2\,safSg=NoRed\,safApp=OpenSAF,safSi=NoRed4,safApp=OpenSAF
>>>> saAmfSISUHAState=ACTIVE(1)
>>>> safSISU=safSu=SC-1\,safSg=2N\,safApp=OpenSAF,safSi=SC-
>>>> 2N,safApp=OpenSAF
>>>> saAmfSISUHAState=ACTIVE(1)
>>>>
>>>>
>>>> Thanks
>>>> -Nagu
>>>>
>>>>> -----Original Message-----
>>>>> From: Minh Hon Chau [mailto:minh.c...@dektech.com.au]
>>>>> Sent: 05 August 2016 02:50
>>>>> To: hans.nordeb...@ericsson.com; Nagendra Kumar; Praveen Malviya;
>>>>> gary....@dektech.com.au; long.hb.ngu...@dektech.com.au;
>>>>> minh.c...@dektech.com.au
>>>>> Cc: opensaf-devel@lists.sourceforge.net
>>>>> Subject: [PATCH 2 of 2] AMFND: Admin operation continuation if csi
>>>> callback
>>>>> completes during headless [#1725 part 1] V1
>>>>>
>>>>> osaf/services/saf/amf/amfnd/di.cc | 199
>>>>> +++++++++++++++++----
>>> --
>>>> --
>>>>> osaf/services/saf/amf/amfnd/include/avnd_di.h | 1 +
>>>>> 2 files changed, 134 insertions(+), 66 deletions(-)
>>>>>
>>>>>
>>>>> The patch buffers susi_resp_msg during headless stage and resend it
>>>>> to AMFD after headless.
>>>>>
>>>>> diff --git a/osaf/services/saf/amf/amfnd/di.cc
>>>>> b/osaf/services/saf/amf/amfnd/di.cc
>>>>> --- a/osaf/services/saf/amf/amfnd/di.cc
>>>>> +++ b/osaf/services/saf/amf/amfnd/di.cc
>>>>> @@ -804,11 +804,6 @@ uint32_t avnd_di_susi_resp_send(AVND_CB
>>>>> if (cb->term_state ==
>>>>> AVND_TERM_STATE_OPENSAF_SHUTDOWN_STARTED)
>>>>> return rc;
>>>>>
>>>>> - if (cb->is_avd_down == true) {
>>>>> - m_AVND_SU_ALL_SI_RESET(su);
>>>>> - return rc;
>>>>> - }
>>>>> -
>>>>> // should be in assignment pending state to be here
>>>>> osafassert(m_AVND_SU_IS_ASSIGN_PEND(su));
>>>>>
>>>>> @@ -819,64 +814,76 @@ uint32_t avnd_di_susi_resp_send(AVND_CB
>>>>> TRACE_ENTER2("Sending Resp su=%s, si=%s, curr_state=%u,
>>>>> prv_state=%u", su->name.value, curr_si->name.value,curr_si-
>>>>>> curr_state,curr_si->prv_state);
>>>>> /* populate the susi resp msg */
>>>>> msg.info.avd = new AVSV_DND_MSG();
>>>>> - msg.type = AVND_MSG_AVD;
>>>>> - msg.info.avd->msg_type = AVSV_N2D_INFO_SU_SI_ASSIGN_MSG;
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.msg_id = ++(cb-
>>>>>> snd_msg_id);
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.node_id = cb-
>>>>>> node_info.nodeId;
>>>>> - if (si) {
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.single_csi =
>>>>> - ((si->single_csi_add_rem_in_si ==
>>>>> AVSV_SUSI_ACT_BASE) ?
>>>>> false : true);
>>>>> - }
>>>>> - TRACE("curr_assign_state '%u'", curr_si->curr_assign_state);
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.msg_act =
>>>>> - (m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_ASSIGNED(curr_si)
>>> ||
>>>>> - m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_ASSIGNING(curr_si))
>>> ?
>>>>> - ((!curr_si->prv_state) ? AVSV_SUSI_ACT_ASGN :
>>>>> AVSV_SUSI_ACT_MOD) : AVSV_SUSI_ACT_DEL;
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.su_name = su->name;
>>>>> - if (si) {
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.si_name = si->name;
>>>>> - if (AVSV_SUSI_ACT_ASGN ==
>>>>> si->single_csi_add_rem_in_si) {
>>>>> - TRACE("si->curr_assign_state '%u'", curr_si-
>>>>>> curr_assign_state);
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.msg_act =
>>>>> -
>>>>> (m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_ASSIGNED(curr_si) ||
>>>>> -
>>>>> m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_ASSIGNING(curr_si)) ?
>>>>> - AVSV_SUSI_ACT_ASGN :
>>>>> AVSV_SUSI_ACT_DEL;
>>>>> - }
>>>>> - }
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.ha_state =
>>>>> - (SA_AMF_HA_QUIESCING == curr_si->curr_state) ?
>>>>> SA_AMF_HA_QUIESCED : curr_si->curr_state;
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.error =
>>>>> - (m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_ASSIGNED(curr_si)
>>> ||
>>>>> - m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_REMOVED(curr_si))
>>> ?
>>>>> NCSCC_RC_SUCCESS : NCSCC_RC_FAILURE;
>>>>> + msg.type = AVND_MSG_AVD;
>>>>> + msg.info.avd->msg_type = AVSV_N2D_INFO_SU_SI_ASSIGN_MSG;
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.node_id = cb-
>>>>>> node_info.nodeId;
>>>>> + if (si) {
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.single_csi =
>>>>> + ((si->single_csi_add_rem_in_si ==
>>>>> AVSV_SUSI_ACT_BASE) ? false : true);
>>>>> + }
>>>>> + TRACE("curr_assign_state '%u'", curr_si->curr_assign_state);
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.msg_act =
>>>>> +
>>>>> (m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_ASSIGNED(curr_si) ||
>>>>> +
>>>>> m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_ASSIGNING(curr_si)) ?
>>>>> + ((!curr_si->prv_state) ?
>>>>> AVSV_SUSI_ACT_ASGN : AVSV_SUSI_ACT_MOD) : AVSV_SUSI_ACT_DEL;
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.su_name = su->name;
>>>>> + if (si) {
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.si_name = si-
>>>>>> name;
>>>>> + if (AVSV_SUSI_ACT_ASGN == si->single_csi_add_rem_in_si) {
>>>>> + TRACE("si->curr_assign_state '%u'", curr_si-
>>>>>> curr_assign_state);
>>>>> + msg.info.avd-
>>>>>> msg_info.n2d_su_si_assign.msg_act =
>>>>> +
>>>>> (m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_ASSIGNED(curr_si) ||
>>>>> +
>>>>> m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_ASSIGNING(curr_si)) ?
>>>>> + AVSV_SUSI_ACT_ASGN :
>>>>> AVSV_SUSI_ACT_DEL;
>>>>> + }
>>>>> + }
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.ha_state =
>>>>> + (SA_AMF_HA_QUIESCING == curr_si->curr_state) ?
>>>>> SA_AMF_HA_QUIESCED : curr_si->curr_state;
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.error =
>>>>> +
>>>>> (m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_ASSIGNED(curr_si) ||
>>>>> +
>>>>> m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_REMOVED(curr_si)) ?
>>>>> +NCSCC_RC_SUCCESS : NCSCC_RC_FAILURE;
>>>>>
>>>>> - if (msg.info.avd->msg_info.n2d_su_si_assign.msg_act ==
>>>>> AVSV_SUSI_ACT_ASGN)
>>>>> - osafassert(si);
>>>>> + if (msg.info.avd->msg_info.n2d_su_si_assign.msg_act ==
>>>>> AVSV_SUSI_ACT_ASGN)
>>>>> + osafassert(si);
>>>>>
>>>>> - /* send the msg to AvD */
>>>>> - TRACE("Sending. msg_id'%u', node_id'%u', msg_act'%u',
>>>>> su'%s',
>>>> si'%s',
>>>>> ha_state'%u', error'%u', single_csi'%u'",
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.msg_id,
>>> msg.info.avd-
>>>>>> msg_info.n2d_su_si_assign.node_id,
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.msg_act,
>>>> msg.info.avd-
>>>>>> msg_info.n2d_su_si_assign.su_name.value,
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.si_name.value,
>>>>> msg.info.avd->msg_info.n2d_su_si_assign.ha_state,
>>>>> - msg.info.avd->msg_info.n2d_su_si_assign.error, msg.info.avd-
>>>>>> msg_info.n2d_su_si_assign.single_csi);
>>>>> + /* send the msg to AvD */
>>>>> + TRACE("Sending. msg_id'%u', node_id'%u', msg_act'%u', su'%s',
>>>>> si'%s', ha_state'%u', error'%u', single_csi'%u'",
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.msg_id,
>>>>> msg.info.avd->msg_info.n2d_su_si_assign.node_id,
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.msg_act,
>>>>> msg.info.avd->msg_info.n2d_su_si_assign.su_name.value,
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.si_name.value,
>>>>> msg.info.avd->msg_info.n2d_su_si_assign.ha_state,
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.error,
>>>>> +msg.info.avd->msg_info.n2d_su_si_assign.single_csi);
>>>>>
>>>>> - if ((su->si_list.n_nodes > 1) && (si == nullptr)) {
>>>>> - if
>>>>> (msg.info.avd->msg_info.n2d_su_si_assign.msg_act ==
>>>>> AVSV_SUSI_ACT_DEL)
>>>>> - LOG_NO("Removed 'all SIs' from '%s'",
>>>>> su->name.value);
>>>>> + if ((su->si_list.n_nodes > 1) && (si == nullptr)) {
>>>>> + if (msg.info.avd->msg_info.n2d_su_si_assign.msg_act ==
>>>>> AVSV_SUSI_ACT_DEL)
>>>>> + LOG_NO("Removed 'all SIs' from '%s'", su-
>>>>>> name.value);
>>>>>
>>>>> - if
>>>>> (msg.info.avd->msg_info.n2d_su_si_assign.msg_act ==
>>>>> AVSV_SUSI_ACT_MOD)
>>>>> - LOG_NO("Assigned 'all SIs' %s of '%s'",
>>>>> - ha_state[msg.info.avd-
>>>>>> msg_info.n2d_su_si_assign.ha_state],
>>>>> - su->name.value);
>>>>> - }
>>>>> + if (msg.info.avd->msg_info.n2d_su_si_assign.msg_act ==
>>>>> AVSV_SUSI_ACT_MOD)
>>>>> + LOG_NO("Assigned 'all SIs' %s of '%s'",
>>>>> + ha_state[msg.info.avd-
>>>>>> msg_info.n2d_su_si_assign.ha_state],
>>>>> + su->name.value);
>>>>> + }
>>>>>
>>>>> - rc = avnd_di_msg_send(cb, &msg);
>>>>> - if (NCSCC_RC_SUCCESS == rc)
>>>>> - msg.info.avd = 0;
>>>>> -
>>>>> - /* we have completed the SU SI msg processing */
>>>>> - if (su_assign_state_is_stable(su))
>>>>> - m_AVND_SU_ASSIGN_PEND_RESET(su);
>>>>> - m_AVND_SU_ALL_SI_RESET(su);
>>>>> + if (cb->is_avd_down == true) {
>>>>> + // We are in headless, buffer this msg
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.msg_id = 0;
>>>>> + if (avnd_diq_rec_add(cb, &msg) == nullptr) {
>>>>> + rc = NCSCC_RC_FAILURE;
>>>>> + }
>>>>> + m_AVND_SU_ALL_SI_RESET(su);
>>>>> + LOG_NO("avnd_di_susi_resp_send() deferred as AMF
>>>>> director is offline");
>>>>> + } else {
>>>>> + // We are in normal cluster, send msg to director
>>>>> + msg.info.avd->msg_info.n2d_su_si_assign.msg_id = ++(cb-
>>>>>> snd_msg_id);
>>>>> + /* send the msg to AvD */
>>>>> + rc = avnd_di_msg_send(cb, &msg);
>>>>> + if (NCSCC_RC_SUCCESS == rc)
>>>>> + msg.info.avd = 0;
>>>>> + /* we have completed the SU SI msg processing */
>>>>> + if (su_assign_state_is_stable(su)) {
>>>>> + m_AVND_SU_ASSIGN_PEND_RESET(su);
>>>>> + }
>>>>> + m_AVND_SU_ALL_SI_RESET(su);
>>>>> + }
>>>>>
>>>>> /* free the contents of avnd message */
>>>>> avnd_msg_content_free(cb, &msg);
>>>>> @@ -1255,14 +1262,7 @@ void avnd_diq_rec_del(AVND_CB *cb, AVND_
>>>>> /* stop the AvD msg response timer */
>>>>> if (m_AVND_TMR_IS_ACTIVE(rec->resp_tmr)) {
>>>>> m_AVND_TMR_MSG_RESP_STOP(cb, *rec);
>>>>> - // Resend msgs from queue because amfd dropped during
>>>>> sync
>>>>> - if ((cb->dnd_list.head != nullptr)) {
>>>>> - TRACE("retransmit message to amfd");
>>>>> - AVND_DND_MSG_LIST *pending_rec = 0;
>>>>> - for (pending_rec = cb->dnd_list.head; pending_rec !=
>>>>> nullptr; pending_rec = pending_rec->next) {
>>>>> - avnd_diq_rec_send(cb, pending_rec);
>>>>> - }
>>>>> - }
>>>>> + avnd_diq_rec_send_buffered_msg(cb);
>>>>> /* resend pg start track */
>>>>> avnd_di_resend_pg_start_track(cb);
>>>>> }
>>>>> @@ -1275,6 +1275,73 @@ void avnd_diq_rec_del(AVND_CB *cb, AVND_
>>>>> TRACE_LEAVE();
>>>>> return;
>>>>> }
>>>>>
>>>>
>>> +/************************************************************
>>>>> ****************
>>>>> + Name : avnd_diq_rec_send_buffered_msg
>>>>> +
>>>>> + Description : Resend buffered msg
>>>>> +
>>>>> + Arguments : cb - ptr to the AvND control block
>>>>> +
>>>>> + Return Values : None.
>>>>> +
>>>>> + Notes : None.
>>>>>
>>>>
>>> +*************************************************************
>>>>> **********
>>>>> +*******/ void avnd_diq_rec_send_buffered_msg(AVND_CB *cb) {
>>>>> + TRACE_ENTER();
>>>>> + // Resend msgs from queue because amfnd dropped during headless
>>>>> + // or headless-synchronization
>>>>> + if ((cb->dnd_list.head != nullptr)) {
>>>>> + AVND_DND_MSG_LIST *pending_rec = 0;
>>>>> + TRACE("Attach msg_id of buffered msg");
>>>>> + bool found = true;
>>>>> + while (found) {
>>>>> + found = false;
>>>>> + for (pending_rec = cb->dnd_list.head; pending_rec !=
>>>>> nullptr; pending_rec = pending_rec->next) {
>>>>> + if (pending_rec->msg.type ==
>>>>> AVND_MSG_AVD) {
>>>>> + // At this moment, only oper_state
>>>>> msg needs to report to director
>>>>> + if (pending_rec->msg.info.avd-
>>>>>> msg_type == AVSV_N2D_INFO_SU_SI_ASSIGN_MSG &&
>>>>> + pending_rec->msg.info.avd-
>>>>>> msg_info.n2d_su_si_assign.msg_id == 0) {
>>>>> + m_AVND_DIQ_REC_POP(cb,
>>>>> pending_rec); #if 0
>>>>> + // only resend if this SUSI
>>>>> does exist
>>>>> + AVND_SU *su =
>>>>> m_AVND_SUDB_REC_GET(cb->sudb,
>>>>> + pending_rec-
>>>>>> msg.info.avd->msg_info.n2d_su_si_assign.su_name);
>>>>> + if (su != nullptr && su-
>>>>>> si_list.n_nodes > 0) { #endif
>>>>> + pending_rec-
>>>>>> msg.info.avd->msg_info.n2d_su_si_assign.msg_id =
>>>>>> ++(cb->snd_msg_id);
>>>>> +
>>>>> m_AVND_DIQ_REC_PUSH(cb, pending_rec);
>>>>> + LOG_NO("Found and
>>>>> resend buffered su_si_assign msg for SU:'%s', "
>>>>> +
>>>>> "SI:'%s', ha_state:'%u', msg_act:'%u', single_csi:'%u', "
>>>>> +
>>>>> "error:'%u', msg_id:'%u'",
>>>>> +
>>>>> pending_rec->msg.info.avd-
>>>>>> msg_info.n2d_su_si_assign.su_name.value,
>>>>> +
>>>>> pending_rec->msg.info.avd-
>>>>>> msg_info.n2d_su_si_assign.si_name.value,
>>>>> +
>>>>> pending_rec->msg.info.avd->msg_info.n2d_su_si_assign.ha_state,
>>>>> +
>>>>> pending_rec->msg.info.avd->msg_info.n2d_su_si_assign.msg_act,
>>>>> +
>>>>> pending_rec->msg.info.avd->msg_info.n2d_su_si_assign.single_csi,
>>>>> +
>>>>> pending_rec->msg.info.avd->msg_info.n2d_su_si_assign.error,
>>>>> +
>>>>> pending_rec->msg.info.avd->msg_info.n2d_su_si_assign.msg_id);
>>>>> +
>>>>> +#if 0
>>>>> + } else {
>>>>> +
>>>>> avnd_msg_content_free(cb, &pending_rec->msg);
>>>>> + delete pending_rec;
>>>>> + pending_rec = cb-
>>>>>> dnd_list.head;
>>>>> + }
>>>>> +#endif
>>>>> + found = true;
>>>>> + }
>>>>> + }
>>>>> + }
>>>>> + }
>>>>> + TRACE("retransmit message to amfd");
>>>>> + for (pending_rec = cb->dnd_list.head; pending_rec !=
>>>>> nullptr;
>>>>> pending_rec = pending_rec->next) {
>>>>> + avnd_diq_rec_send(cb, pending_rec);
>>>>> + }
>>>>> + }
>>>>> + TRACE_LEAVE();
>>>>> + return;
>>>>> +}
>>>>>
>>>>>
>>>>>
>>>>
>>> /*************************************************************
>>>>> ***************
>>>>> Name : avnd_diq_rec_send
>>>>> diff --git a/osaf/services/saf/amf/amfnd/include/avnd_di.h
>>>>> b/osaf/services/saf/amf/amfnd/include/avnd_di.h
>>>>> --- a/osaf/services/saf/amf/amfnd/include/avnd_di.h
>>>>> +++ b/osaf/services/saf/amf/amfnd/include/avnd_di.h
>>>>> @@ -79,6 +79,7 @@ void avnd_di_msg_ack_process(struct avnd void
>>>>> avnd_diq_del(struct avnd_cb_tag *); AVND_DND_MSG_LIST
>>>>> *avnd_diq_rec_add(struct avnd_cb_tag *cb, AVND_MSG *msg); void
>>>>> avnd_diq_rec_del(struct avnd_cb_tag *cb, AVND_DND_MSG_LIST *rec);
>>>>> +void avnd_diq_rec_send_buffered_msg(struct avnd_cb_tag *cb);
>>>>> uint32_t avnd_diq_rec_send(struct avnd_cb_tag *cb,
>>>> AVND_DND_MSG_LIST
>>>>> *rec); uint32_t avnd_di_reg_su_rsp_snd(struct avnd_cb_tag *cb,
>>>>> SaNameT *su_name, uint32_t ret_code); uint32_t
>>>> avnd_di_ack_nack_msg_send(struct
>>>>> avnd_cb_tag *cb, uint32_t rcv_id, uint32_t view_num);
>>>>
>>>> ----------------------------------------------------------------------
>>>> -------- _______________________________________________
>>>> Opensaf-devel mailing list
>>>> Opensaf-devel@lists.sourceforge.net
>>>> https://lists.sourceforge.net/lists/listinfo/opensaf-devel
>>>
>>> ------------------------------------------------------------------------------
>>>
>>>
>>> _______________________________________________
>>> Opensaf-devel mailing list
>>> Opensaf-devel@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/opensaf-devel
>
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
