starlingx/metal
Code Issues Proposed changes

Merge "Fix guest heartbeat status and reporting state"

Browse Source
This commit is contained in:
Zuul 2018-06-25 13:01:17 +00:00 committed by Gerrit Code Review
commit c41b9686de
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mtce-common/cgts-mtce-common-1.0/guest/guestAgent.cpp
View File

@ -855,18 +855,12 @@ int recv_from_guestServer ( unsigned int cmd, char * buf_ptr )
if ( instInfo_ptr )
{
string state ;
string status;
if ( instInfo_ptr->heartbeat.reporting == true )
state = "enabled" ;
else
state = "disabled" ;
if ( instInfo_ptr->heartbeating == true )
status = "enabled" ;
else
status = "disabled" ;
if ( cmd == MTC_EVENT_HEARTBEAT_ILLHEALTH )
{
ilog ("%s %s ill health notification\n", hostname.c_str(), instInfo_ptr->uuid.c_str());
@ -879,6 +873,7 @@ int recv_from_guestServer ( unsigned int cmd, char * buf_ptr )
instInfo_ptr->heartbeating = true ;
ilog ("%s %s is now heartbeating\n", hostname.c_str(), instInfo_ptr->uuid.c_str());
}
string status = "enabled";
rc = guestVimApi_svc_event ( hostname, uuid, state, status, instInfo_ptr->restart_to_str);
}
else
@ -888,11 +883,11 @@ int recv_from_guestServer ( unsigned int cmd, char * buf_ptr )
instInfo_ptr->heartbeating = false ;
wlog ("%s %s is not heartbeating\n", hostname.c_str(), instInfo_ptr->uuid.c_str());
}
string status = "disabled";
rc = guestVimApi_svc_event ( hostname, uuid, state, status, "0");
}
if ( rc != PASS )
{
/* TODO: make this an elog before delivery */
elog ("%s %s failed to send state change 'event' to vim (rc:%d)\n",
hostname.c_str(), instInfo_ptr->uuid.c_str(), rc );
}

4
mtce-common/cgts-mtce-common-1.0/guest/guestSvrMsg.cpp
View File

@ -337,8 +337,8 @@ int recv_from_guestAgent ( unsigned int cmd, char * buf_ptr )
state.c_str());
get_instInv_ptr()->add_inst ( uuid, instance );
manage_reporting_state ( &instance, state );
instInfo * instInfo_ptr = get_instInv_ptr()->get_inst ( uuid );
manage_reporting_state ( instInfo_ptr, state );
}
if (daemon_get_cfg_ptr()->debug_level )
get_instInv_ptr()->print_instances();