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

Merge branch 'develop' into MCOL-3536

Browse Source
This commit is contained in:
David Hall
2020-05-28 14:20:32 -05:00
parent 2e66b1f1e8 b1a2adbab7
commit a43de9d536
28 changed files with 300 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
writeengine/redistribute/we_redistributecontrolthread.cpp
View File

@ -617,7 +617,8 @@ int RedistributeControlThread::executeRedistributePlan()
{
try
{
// skip system status check in case no OAM
// skip system status check in case no OAM
/*
if (getenv("SKIP_OAM_INIT") == NULL)
{
// make sure system is in active state
@ -646,6 +647,7 @@ int RedistributeControlThread::executeRedistributePlan()
sleep(1);;
}
}
*/
if (fStopAction)
return RED_EC_USER_STOP;

3
writeengine/splitter/we_sdhandler.cpp
View File

@ -542,7 +542,7 @@ void WESDHandler::setup()
}
// getModuleStatus will take too long. Also to test in development
if (getenv("SKIP_OAM_INIT") == NULL)
/* if (getenv("SKIP_OAM_INIT") == NULL)
{
vector<unsigned int>& aVec = fRef.fCmdArgs.getPmVec();
@ -573,6 +573,7 @@ void WESDHandler::setup()
}
}
}
*/
int rtn = fDbrm.getSystemReady();