starlingx
/
ha
Code Issues Proposed changes

Merge "Fix AIO-DX/DC no controller active issue"

This commit is contained in:
Zuul 2019-01-07 22:57:50 +00:00 committed by Gerrit Code Review
parent e406346c98 6c93e74230
commit ff1b69302e
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
service-mgmt/sm-1.0.0/src/sm_failover.c
View File

@ -316,8 +316,20 @@ void sm_failover_heartbeat_restore( SmFailoverInterfaceT* interface )
} }
else if( SM_FAILOVER_INTERFACE_DOWN == state ) else if( SM_FAILOVER_INTERFACE_DOWN == state )
{ {
// need to wait for if up bool enabled = true;
return; SmErrorT error = sm_hw_get_if_state(interface->interface_name, &enabled);
if(SM_OKAY != error)
{
DPRINTFE("Couldn't get interface (%s) state. ", interface->interface_name);
}
if(!enabled)
{
// need to wait for if up
return;
}else
{
DPRINTFI("Interface %s is verified as UP after receiving heartbeat.", interface->interface_name);
}
} }
if(if_info->set_state(SM_FAILOVER_INTERFACE_OK)) if(if_info->set_state(SM_FAILOVER_INTERFACE_OK))
@ -1104,8 +1116,8 @@ void _log_nodes_state()
} }
DPRINTFI("Host state %d, I/F state %d, peer I/F state %d", DPRINTFI("Host state %d, I/F state %d, peer I/F state %d",
_node_comm_state, _node_comm_state,
_peer_if_state, _host_state,
_host_state _peer_if_state
); );
} }
// **************************************************************************** // ****************************************************************************