starlingx
/
metal
Code Issues Proposed changes

Merge "Mtce: Improve AIO DOR handling"

This commit is contained in:
Zuul 2018-06-27 21:09:37 +00:00 committed by Gerrit Code Review
parent eb18b90340 e0d9d60d28
commit 2b5a400b92
1 changed files with 41 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1248,13 +1248,11 @@ void daemon_service_run ( void )
daemon_latency_monitor (true);
/* DOR Mode Check */
{
int enabled_nodes = mtcInv.enabled_nodes();
if ( enabled_nodes )
{
struct timespec ts ;
clock_gettime (CLOCK_MONOTONIC, &ts );
#ifdef WANT_FIT_TESTING
/* Support low uptime FIT for testing */
if ( daemon_is_file_present ( MTC_CMD_FIT__UPTIME ))
{
@ -1264,6 +1262,7 @@ void daemon_service_run ( void )
ts.tv_sec/60,
ts.tv_sec%60);
}
#endif
if ( ts.tv_sec < MTC_MINS_20 )
{
@ -1293,8 +1292,6 @@ void daemon_service_run ( void )
ilog ("%-12s ---------- ; DOR Recovery ---------------------- -------------------\n", mtcInv.my_hostname.c_str());
mtcTimer_start ( mtcInv.mtcTimer_dor, mtcTimer_handler, timeout );
}
}
}
/* Run Maintenance service forever */
for ( ; ; )
@ -1451,8 +1448,6 @@ void daemon_service_run ( void )
}
}
// timeUtil_sched_sample ( );
daemon_signal_hdlr ();
/* If the timer is no longer active and we are in DOR mode