starlingx
/
ha
Code Issues Proposed changes

Cleanup loggings 

SM receives network interfaces state change on controllers.
But it should only log state changed of the network interfaces
that are used by SM.

Closes-Bug: 1823531

Change-Id: Iacdeeb8cfbb288b6b5572db606b97c18847950db
Signed-off-by: Bin Qian <bin.qian@windriver.com>
This commit is contained in:
Bin Qian 2019-06-06 11:40:07 -04:00
parent 0259011983
commit 4b9ace1ef3
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,6 +355,10 @@ void sm_failover_interface_down( const char* const interface_name )
SmServiceDomainInterfaceT* interface = iter->get_interface();
if( 0 == strcmp(interface_name, interface->interface_name) )
{
if(0 == impacted)
{
DPRINTFI("Interface %s is down", interface_name);
}
impacted ++;
if(iter->set_state(SM_FAILOVER_INTERFACE_DOWN))
{
@ -364,16 +368,8 @@ void sm_failover_interface_down( const char* const interface_name )
}
}
if( 0 == impacted )
if( 0 < impacted )
{
DPRINTFD("No domain interface is impacted as i/f %s is down.",
interface_name);
}
else
{
DPRINTFI("%d domain interfaces are impacted as i/f %s is down.",
impacted, interface_name);
_if_state_changed = true;
}
}
@ -393,6 +389,10 @@ void sm_failover_interface_up( const char* const interface_name )
SmServiceDomainInterfaceT* interface = iter->get_interface();
if( 0 == strcmp(interface_name, interface->interface_name) )
{
if(0 == impacted)
{
DPRINTFI("Interface %s is up", interface_name);
}
impacted ++;
if(iter->set_state(SM_FAILOVER_INTERFACE_RECOVERING))
{
@ -402,16 +402,8 @@ void sm_failover_interface_up( const char* const interface_name )
}
}
if( 0 == impacted )
if( 0 < impacted )
{
DPRINTFI("No domain interface is impacted as i/f %s is up.",
interface_name);
}
else
{
DPRINTFI("%d domain interfaces are impacted as i/f %s is up.",
impacted, interface_name);
_if_state_changed = true;
}
}
@ -1201,11 +1193,9 @@ static void sm_failover_interface_change_callback(
switch ( if_change->interface_state )
{
case SM_INTERFACE_STATE_DISABLED:
DPRINTFI("Interface %s is down", if_change->interface_name);
sm_failover_interface_down(if_change->interface_name);
break;
case SM_INTERFACE_STATE_ENABLED:
DPRINTFI("Interface %s is up", if_change->interface_name);
sm_failover_interface_up(if_change->interface_name);
break;
default:

3
service-mgmt/sm-common-1.0.0/src/sm_hw.c
View File

@ -251,8 +251,7 @@ SmErrorT sm_hw_get_if_state( const char if_name[], bool* enabled )
*enabled = false;
}
} else {
DPRINTFE( "Failed to get interface state for interface (%s), "
"error=%s.", if_name, strerror( errno ) );
// there are interfaces are not monitored by SM, so don't log
return( SM_NOT_FOUND );
}