osaf/services/saf/amf/amfd/sgproc.cc | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
AMF increments active assignment counter (saAmfSINumCurrActiveAssignments) in
SI when it sends modify active assignment to a SU. If sufailover occurs when a
SU is in modify active state, then AMF should decrement the count before
deleting its SUSI. This patch ensures that saAmfSINumCurrActiveAssignments is
decremented for SIs which are in active modify state during suFailover.
diff --git a/osaf/services/saf/amf/amfd/sgproc.cc
b/osaf/services/saf/amf/amfd/sgproc.cc
--- a/osaf/services/saf/amf/amfd/sgproc.cc
+++ b/osaf/services/saf/amf/amfd/sgproc.cc
@@ -293,6 +293,14 @@ static uint32_t sg_su_failover_func(AVD_
avd_susi_update_assignment_counters(susi,
AVSV_SUSI_ACT_MOD,
SA_AMF_HA_QUIESCING,
SA_AMF_HA_QUIESCED);
}
+ else if ((susi->fsm == AVD_SU_SI_STATE_MODIFY) &&
+ (susi->state == SA_AMF_HA_ACTIVE)) {
+ /* SUSI is undergoing active modification. For
active state
+ saAmfSINumCurrActiveAssignments was
increased when active
+ assignment had been sent. So decrement the
count in SI before
+ deleting the SUSI. */
+ avd_si_dec_curr_act_ass(susi->si);
+ }
}
su->sg_of_su->node_fail(avd_cb, su);
avd_sg_su_asgn_del_util(avd_cb, su, true, false);
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
