1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

MCOL-1523

This commit is contained in:
David Hill
2018-09-05 14:53:13 -05:00
parent e5f18964f0
commit 8b0507b987
5 changed files with 52 additions and 106 deletions

View File

@ -2451,17 +2451,17 @@ void processStatusMSG(messageqcpp::IOSocket* cfIos)
}
//if DMLProc set to ACTIVE, set system state to ACTIVE if in an INIT state
if ( processName == "DMLProc" && state == oam::ACTIVE )
{
if ( fShmSystemStatus[0].OpState == oam::BUSY_INIT ||
fShmSystemStatus[0].OpState == oam::MAN_INIT ||
fShmSystemStatus[0].OpState == oam::AUTO_INIT )
{
fShmSystemStatus[0].OpState = state;
memcpy(fShmSystemStatus[0].StateChangeDate, oam.getCurrentTime().c_str(), DATESIZE);
log.writeLog(__LINE__, "statusControl: REQUEST RECEIVED: Set System State = " + oamState[state], LOG_TYPE_DEBUG);
}
}
// if ( processName == "DMLProc" && state == oam::ACTIVE )
// {
// if ( fShmSystemStatus[0].OpState == oam::BUSY_INIT ||
// fShmSystemStatus[0].OpState == oam::MAN_INIT ||
// fShmSystemStatus[0].OpState == oam::AUTO_INIT )
// {
// fShmSystemStatus[0].OpState = state;
// memcpy(fShmSystemStatus[0].StateChangeDate, oam.getCurrentTime().c_str(), DATESIZE);
// log.writeLog(__LINE__, "statusControl: REQUEST RECEIVED: Set System State = " + oamState[state], LOG_TYPE_DEBUG);
// }
// }
}
break;