starlingx/metal
Code Issues Proposed changes

Merge "Change enabled_count variable from bool to int in nodeLinkClass"

Browse Source
This commit is contained in:
Zuul 2019-06-24 17:20:25 +00:00 committed by Gerrit Code Review
commit b6fd92cada
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mtce/src/common/nodeClass.h
View File

@ -362,7 +362,7 @@ private:
bool inservice_failed_subf ; bool inservice_failed_subf ;
/** node has reached enabled state this number of times */ /** node has reached enabled state this number of times */
bool enabled_count ; int enabled_count ;
/** Number of OOS tests run so far */ /** Number of OOS tests run so far */
int oos_test_count ; int oos_test_count ;

8
mtce/src/maintenance/mtcNodeHdlrs.cpp
View File

@ -4612,13 +4612,13 @@ int nodeLinkClass::reboot_handler ( struct nodeLinkClass::node * node_ptr )
{ {
if ( !node_ptr->mtcCmd_work_fifo.empty() ) if ( !node_ptr->mtcCmd_work_fifo.empty() )
node_ptr->mtcCmd_work_fifo.pop_front(); node_ptr->mtcCmd_work_fifo.pop_front();
if ( !node_ptr->mtcCmd_work_fifo.empty() ) if ( !node_ptr->mtcCmd_work_fifo.empty() )
mtcCmd_workQ_purge ( node_ptr ); mtcCmd_workQ_purge ( node_ptr );
if ( !node_ptr->mtcCmd_done_fifo.empty() ) if ( !node_ptr->mtcCmd_done_fifo.empty() )
node_ptr->mtcCmd_done_fifo.pop_front(); node_ptr->mtcCmd_done_fifo.pop_front();
if ( !node_ptr->mtcCmd_done_fifo.empty() ) if ( !node_ptr->mtcCmd_done_fifo.empty() )
mtcCmd_doneQ_purge ( node_ptr ); mtcCmd_doneQ_purge ( node_ptr );
mtcInvApi_force_task ( node_ptr, "" ); mtcInvApi_force_task ( node_ptr, "" );
adminActionChange ( node_ptr, MTC_ADMIN_ACTION__NONE ); adminActionChange ( node_ptr, MTC_ADMIN_ACTION__NONE );