Ack code reivew only. I think commit message must include Red model name. Thanks, Praveen
On 31-Mar-16 9:05 AM, Gary Lee wrote: > Hi > > I will push this tomorrow if there are no more comments. > > Thanks > Gary > > > > > On 11/03/2016, 7:13 PM, "Hans Nordebäck" <[email protected]> wrote: > >> ack, code review only/Thanks HansN >> >> On 02/02/2016 07:48 AM, Gary Lee wrote: >>> osaf/services/saf/amf/amfd/sg_nored_fsm.cc | 19 ++++++++++--------- >>> 1 files changed, 10 insertions(+), 9 deletions(-) >>> >>> >>> failed SU is not necessarily involved in the SG realignment >>> >>> diff --git a/osaf/services/saf/amf/amfd/sg_nored_fsm.cc >>> b/osaf/services/saf/amf/amfd/sg_nored_fsm.cc >>> --- a/osaf/services/saf/amf/amfd/sg_nored_fsm.cc >>> +++ b/osaf/services/saf/amf/amfd/sg_nored_fsm.cc >>> @@ -812,17 +812,18 @@ >>> m_AVD_CLEAR_SG_ADMIN_SI(cb, (su->sg_of_su)); >>> l_si->set_admin_state(SA_AMF_ADMIN_LOCKED); >>> } else { >>> + if (in_su_oper_list(su) == true) { >>> + su_oper_list_del(su); >>> >>> - su_oper_list_del(su); >>> + su_node_ptr = su->get_node_ptr(); >>> >>> - su_node_ptr = su->get_node_ptr(); >>> - >>> - if (su->saAmfSUAdminState == >>> SA_AMF_ADMIN_SHUTTING_DOWN) { >>> - su->set_admin_state(SA_AMF_ADMIN_LOCKED); >>> - } else if ((su_node_ptr->saAmfNodeAdminState == >>> SA_AMF_ADMIN_SHUTTING_DOWN) && >>> - (old_state == SA_AMF_HA_QUIESCING)) { >>> - if (su_node_ptr->is_node_lock() == true) { >>> - node_admin_state_set(su_node_ptr, >>> SA_AMF_ADMIN_LOCKED); >>> + if (su->saAmfSUAdminState == >>> SA_AMF_ADMIN_SHUTTING_DOWN) { >>> + >>> su->set_admin_state(SA_AMF_ADMIN_LOCKED); >>> + } else if ((su_node_ptr->saAmfNodeAdminState == >>> SA_AMF_ADMIN_SHUTTING_DOWN) && >>> + (old_state == SA_AMF_HA_QUIESCING)) { >>> + if (su_node_ptr->is_node_lock() == >>> true) { >>> + >>> node_admin_state_set(su_node_ptr, SA_AMF_ADMIN_LOCKED); >>> + } >>> } >>> } >>> } >> > ------------------------------------------------------------------------------ Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Click to learn more. http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140 _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
