database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-31 18:30:33 +03:00
Code Activity

nonglobaled procmgr dbstorage and fix package install, missing bracket

Browse Source
This commit is contained in:
david hill
2017-09-12 15:28:20 -05:00
parent f6f15028a8
commit beb126d8bf
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
oam/install_scripts/package_installer.sh
View File

@@ -340,6 +340,7 @@ set timeout 60
expect { expect {
"No such file" { send_user "ERROR: $INSTALLDIR/bin/columnstore Not Found\n" ; exit 1 } "No such file" { send_user "ERROR: $INSTALLDIR/bin/columnstore Not Found\n" ; exit 1 }
"Exit status 0" { send_user "DONE" } "Exit status 0" { send_user "DONE" }
}
send_user "\n" send_user "\n"

12
procmgr/main.cpp
View File

@@ -58,7 +58,6 @@ bool HDFS = false;
string localHostName; string localHostName;
string PMwithUM = "n"; string PMwithUM = "n";
string MySQLRep = "n"; string MySQLRep = "n";
string DBRootStorageType = "internal";
// pushing the ACTIVE_ALARMS_FILE to all nodes every 10 seconds. // pushing the ACTIVE_ALARMS_FILE to all nodes every 10 seconds.
const int ACTIVE_ALARMS_PUSHING_INTERVAL = 10; const int ACTIVE_ALARMS_PUSHING_INTERVAL = 10;
@@ -170,7 +169,7 @@ int main(int argc, char **argv)
if ( DBRootStorageType == "hdfs" ) if ( DBRootStorageType == "hdfs" )
HDFS = true; HDFS = true;
log.writeLog(__LINE__, "DBRootStorageType = " + DBRootStorageType, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "Main: DBRootStorageType = " + DBRootStorageType, LOG_TYPE_DEBUG);
//PMwithUM config //PMwithUM config
try { try {
@@ -1016,6 +1015,15 @@ void pingDeviceThread()
extDeviceInfoList.insert(extDeviceList::value_type(name, 0)); extDeviceInfoList.insert(extDeviceList::value_type(name, 0));
} }
//storage config
string DBRootStorageType;
try {
oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
}
catch(...) {}
log.writeLog(__LINE__, "pingDeviceThread: DBRootStorageType = " + DBRootStorageType, LOG_TYPE_DEBUG);
int rtnCode = 0; int rtnCode = 0;
Configuration configData; Configuration configData;
SystemStatus systemstatus; SystemStatus systemstatus;

22
procmgr/processmanager.cpp
View File

@@ -72,7 +72,6 @@ bool startsystemthreadRunning = false;
string gdownActiveOAMModule; string gdownActiveOAMModule;
vector<string> downModuleList; vector<string> downModuleList;
bool startFailOver = false; bool startFailOver = false;
extern string DBRootStorageType;
string masterLogFile = oam::UnassignedName; string masterLogFile = oam::UnassignedName;
string masterLogPos = oam::UnassignedName; string masterLogPos = oam::UnassignedName;
@@ -8625,6 +8624,15 @@ int ProcessManager::switchParentOAMModule(std::string newActiveModuleName)
log.writeLog(__LINE__, "switchParentOAMModule Function Started", LOG_TYPE_DEBUG); log.writeLog(__LINE__, "switchParentOAMModule Function Started", LOG_TYPE_DEBUG);
//storage config
string DBRootStorageType;
try {
oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
}
catch(...) {}
log.writeLog(__LINE__, "switchParentOAMModule: DBRootStorageType = " + DBRootStorageType, LOG_TYPE_DEBUG);
if ( DBRootStorageType == "internal" && DataRedundancyConfig == "n") { if ( DBRootStorageType == "internal" && DataRedundancyConfig == "n") {
log.writeLog(__LINE__, "ERROR: DBRootStorageType = internal", LOG_TYPE_ERROR); log.writeLog(__LINE__, "ERROR: DBRootStorageType = internal", LOG_TYPE_ERROR);
pthread_mutex_unlock(&THREAD_LOCK); pthread_mutex_unlock(&THREAD_LOCK);
@@ -9224,6 +9232,15 @@ int ProcessManager::OAMParentModuleChange()
} }
//storage config
string DBRootStorageType;
try {
oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
}
catch(...) {}
log.writeLog(__LINE__, "OAMParentModuleChange: DBRootStorageType = " + DBRootStorageType, LOG_TYPE_DEBUG);
if ( DBRootStorageType == "internal" && failover && DataRedundancyConfig == "n") if ( DBRootStorageType == "internal" && failover && DataRedundancyConfig == "n")
{ {
log.writeLog(__LINE__, "DBRoot Storage configured for internal, don't do standby-active failover", LOG_TYPE_DEBUG); log.writeLog(__LINE__, "DBRoot Storage configured for internal, don't do standby-active failover", LOG_TYPE_DEBUG);
@@ -9240,9 +9257,6 @@ int ProcessManager::OAMParentModuleChange()
//run save.brm script //run save.brm script
processManager.saveBRM(true, false); processManager.saveBRM(true, false);
//set query system state not ready
processManager.setQuerySystemState(false);
gdownActiveOAMModule = downOAMParentName; gdownActiveOAMModule = downOAMParentName;
// update Columnstore.xml entries // update Columnstore.xml entries