osaf/services/saf/amf/amfd/role.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
AMFD now orders a reboot of the standby SC in all cases when a failover STANDBY
-> ACTIVE fails. Previously, the case when the failover failed because the
standby AMFD was not in sync was handled differently from other causes and in
this case AMFD did not order a reboot.
diff --git a/osaf/services/saf/amf/amfd/role.cc
b/osaf/services/saf/amf/amfd/role.cc
--- a/osaf/services/saf/amf/amfd/role.cc
+++ b/osaf/services/saf/amf/amfd/role.cc
@@ -364,7 +364,7 @@ static void avd_act_on_sis_in_tol_timer_
static uint32_t avd_role_failover(AVD_CL_CB *cb, SaAmfHAStateT role)
{
uint32_t status = NCSCC_RC_FAILURE;
- AVD_AVND *my_node, *failed_node;
+ AVD_AVND *my_node = nullptr, *failed_node;
SaAisErrorT rc;
TRACE_ENTER();
@@ -381,7 +381,7 @@ static uint32_t avd_role_failover(AVD_CL
*/
if (AVD_STBY_OUT_OF_SYNC == cb->stby_sync_state) {
LOG_ER("FAILOVER StandBy --> Active FAILED, Standby OUT OF
SYNC");
- return NCSCC_RC_FAILURE;
+ goto done;
}
if (nullptr == (my_node = avd_node_find_nodeid(cb->node_id_avd))) {
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
