starlingx
/
ha
Code Issues Proposed changes

Initialize sm_hw earlier 

The sm_hw is initialized too late to cause a few error log messages:

Failed to find thread information.
Failed to audit hardware state of interface (lo), error=FAILED


Change-Id: Ie7f813ff9a7900785e6d2af0ad5a75edc0cbf7c0
Partial-Bug: 1816764
Signed-off-by: Bin Qian <bin.qian@windriver.com>
This commit is contained in:
Bin Qian 2019-02-22 09:15:49 -05:00
parent fca5d91299
commit f86e8160dd
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1275,6 +1275,17 @@ SmErrorT sm_failover_initialize( void )
return SM_FAILED;
}
SmHwCallbacksT callbacks;
memset( &callbacks, 0, sizeof(callbacks) );
callbacks.interface_change = sm_failover_interface_change_callback;
error = sm_hw_initialize( &callbacks );
if( SM_OKAY != error )
{
DPRINTFE( "Failed to initialize hardware module, error=%s.",
sm_error_str( error ) );
return( error );
}
_total_interfaces = 0;
sm_service_domain_interface_table_foreach(
user_data,
@ -1350,17 +1361,6 @@ SmErrorT sm_failover_initialize( void )
DPRINTFE("Failed to initialize cluster hbs info messaging");
}
SmHwCallbacksT callbacks;
memset( &callbacks, 0, sizeof(callbacks) );
callbacks.interface_change = sm_failover_interface_change_callback;
error = sm_hw_initialize( &callbacks );
if( SM_OKAY != error )
{
DPRINTFE( "Failed to initialize hardware module, error=%s.",
sm_error_str( error ) );
return( error );
}
return SM_OKAY;
}
// ****************************************************************************
@ -1373,16 +1373,6 @@ SmErrorT sm_failover_finalize( void )
_total_interfaces = 0;
SmErrorT error;
SmHwCallbacksT callbacks;
memset( &callbacks, 0, sizeof(callbacks) );
callbacks.interface_change = sm_failover_interface_change_callback;
error = sm_hw_initialize( &callbacks );
if( SM_OKAY != error )
{
DPRINTFE( "Failed to initialize hardware module, error=%s.",
sm_error_str( error ) );
return( error );
}
error = SmClusterHbsInfoMsg::finalize();
if(SM_OKAY != error)
@ -1403,11 +1393,17 @@ SmErrorT sm_failover_finalize( void )
_sm_db_handle = NULL;
}
error = sm_hw_finalize();
if( SM_OKAY != error )
{
DPRINTFE( "Failed to finalize hardware module, error=%s.",
sm_error_str( error ) );
}
error = SmFailoverFSM::finalize();
if( SM_OKAY != error )
{
DPRINTFE( "Failed to finalize failover FSM, error %s.", sm_error_str( error ) );
return error;
}
pthread_mutex_destroy(&_mutex);