starlingx
/
metal
Code Issues Proposed changes

Merge "Enable host heartbeat in add handler when not in DOR mode"

This commit is contained in:
Zuul 2018-08-23 13:21:20 +00:00 committed by Gerrit Code Review
parent 319af8ffa3 7da4eb945f
commit 6a1999a371
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeCtrl.cpp
View File

@ -1248,7 +1248,7 @@ void daemon_service_run ( void )
} }
#endif #endif
if ( ts.tv_sec < MTC_MINS_20 ) if ( ts.tv_sec < MTC_MINS_15 )
{ {
/* CPE DOR window is much greater in CPE since heartbeat /* CPE DOR window is much greater in CPE since heartbeat
* cannot start until the inactive CPE has run both manifests */ * cannot start until the inactive CPE has run both manifests */

2
mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeHdlrs.cpp
View File

@ -5607,7 +5607,7 @@ int nodeLinkClass::add_handler ( struct nodeLinkClass::node * node_ptr )
if ( NOT_THIS_HOST ) if ( NOT_THIS_HOST )
{ {
if (( LARGE_SYSTEM ) || if (( LARGE_SYSTEM ) ||
(( CPE_SYSTEM ) && ( is_controller(node_ptr) == false ))) (( CPE_SYSTEM ) && ( this->dor_mode_active == false )))
{ {
send_hbs_command ( node_ptr->hostname, MTC_CMD_START_HOST ); send_hbs_command ( node_ptr->hostname, MTC_CMD_START_HOST );
} }