database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge pull request #1223 from drrtuy/MCOL-4018

Browse Source 
MCOL-4018 Disable legacy OAM by default.
This commit is contained in:
Roman Nozdrin
2020-05-27 11:33:36 +03:00
committed by GitHub
parent eec7b58a40 ee4589ef40
commit 2647629c5d
7 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dbcon/mysql/ha_mcs_client_udfs.cpp
View File

@ -293,8 +293,6 @@ extern "C"
SystemStatus systemstatus;
try
{
if (getenv("SKIP_OAM_INIT"))
{
if (dbrm.getSystemReady()
&& dbrm.getSystemQueryReady())
@ -302,18 +300,6 @@ extern "C"
return 1;
}
}
else
{
oam.getSystemStatus(systemstatus);
if (systemstatus.SystemOpState == ACTIVE
&& dbrm.getSystemReady()
&& dbrm.getSystemQueryReady())
{
return 1;
}
}
}
catch (...)
{
*error = 1;

2
exemgr/main.cpp
View File

@ -1643,7 +1643,7 @@ int main(int argc, char* argv[])
{
}
}
if (getenv("SKIP_OAM_INIT"))
{
BRM::DBRM *dbrm = new BRM::DBRM();
dbrm->setSystemQueryReady(true);

2
oam/oamcpp/liboamcpp.cpp
View File

@ -2372,7 +2372,7 @@ void Oam::setProcessStatus(const std::string process, const std::string module,
void Oam::processInitComplete(std::string processName, int state)
{
//This method takes too long on Windows and doesn't do anything there anyway...
if (getenv("SKIP_OAM_INIT") != NULL)
// Disable legacy OAM
return;
// get current Module name
string moduleName;

3
oam/oamcpp/oamcache.cpp
View File

@ -111,6 +111,8 @@ void OamCache::checkReload()
// Restore for Windows when we support multiple PMs
while (it != uniquePids.end())
{
// Disable legacy-OAM.
/*
if (getenv("SKIP_OAM_INIT") == NULL)
{
try
@ -182,6 +184,7 @@ void OamCache::checkReload()
}
}
else
*/
{
pmToConnectionMap[*it] = i++;
moduleIds.push_back(*it);

4
oamapps/mcsadmin/mcsadmin.cpp
View File

@ -174,10 +174,8 @@ void setupSignalHandlers()
int main(int argc, char* argv[])
{
// print a warning if this is a developer build
if (getenv("SKIP_OAM_INIT"))
{
cout << "SKIP_OAM_INIT is set" << endl;
cout << "SKIP_OAM_INIT is set and legacy OAM is disabled by default" << endl;
sleep(2);
}

2
writeengine/redistribute/we_redistributecontrolthread.cpp
View File

@ -618,6 +618,7 @@ int RedistributeControlThread::executeRedistributePlan()
try
{
// 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();