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

Updated with latest InfiniDB Develop (4.6.6)

This commit is contained in:
David Hall
2016-01-14 10:27:21 -06:00
parent f6afc42dd0
commit 1bd427486c
27 changed files with 556 additions and 373 deletions

View File

@ -442,17 +442,24 @@ int RedistributeControlThread::executeRedistributePlan()
bool isActive = false;
while (!isActive)
{
bool noExcept = true;
SystemStatus systemstatus;
systemstatus.SystemOpState = oam::ACTIVE;
try
{
fControl->fOam->getSystemStatus(systemstatus);
}
catch (const std::exception& ex)
{
fErrorMsg += ex.what();
noExcept = false;
}
catch (...)
{}
{
noExcept = false;
}
if ((isActive = (systemstatus.SystemOpState == oam::ACTIVE) == false))
sleep(1);
if (noExcept && ((isActive = (systemstatus.SystemOpState == oam::ACTIVE)) == false))
sleep(1);;
}
#endif