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

Made OAM suppress its knowledge of StorageManager if it is disabled.

Browse Source
This commit is contained in:
Patrick LeBlanc
2019-06-10 13:02:56 -05:00
parent d454f84b82
commit f34f785f8a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
oam/oamcpp/liboamcpp.cpp
View File

@ -1974,7 +1974,11 @@ void Oam::getProcessConfig(SystemProcessConfig& systemprocessconfig)
systemprocessconfig.processconfig.clear(); systemprocessconfig.processconfig.clear();
Config* proConfig = Config::makeConfig(ProcessConfigFile.c_str()); Config* proConfig = Config::makeConfig(ProcessConfigFile.c_str());
Config *csConfig = Config::makeConfig();
string strStorageManagerEnabled = csConfig->getConfig("StorageManager", "Enabled");
bool storageManagerEnabled = !strStorageManagerEnabled.empty() && (strStorageManagerEnabled[0] == 'Y' ||
strStorageManagerEnabled[0] == 'y' || strStorageManagerEnabled[0] == 'T' || strStorageManagerEnabled[0] == 't');
for (int processID = 1; processID < MAX_PROCESS + 1; processID++) for (int processID = 1; processID < MAX_PROCESS + 1; processID++)
{ {
ProcessConfig processconfig; ProcessConfig processconfig;
@ -1987,7 +1991,8 @@ void Oam::getProcessConfig(SystemProcessConfig& systemprocessconfig)
proConfig->getConfig(sectionName, "ModuleType"), proConfig->getConfig(sectionName, "ModuleType"),
processconfig ); processconfig );
if (processconfig.ProcessName.empty()) if (processconfig.ProcessName.empty() ||
(!storageManagerEnabled && processconfig.ProcessName == "StorageManager"))
continue; continue;
systemprocessconfig.processconfig.push_back(processconfig); systemprocessconfig.processconfig.push_back(processconfig);