1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00

Checked for references to DBRootStorageType, made a couple changes

I suspect are necessary to make failover work.
This commit is contained in:
Patrick LeBlanc
2019-06-12 13:07:22 -05:00
parent 366cd406ba
commit 753139a933
3 changed files with 6 additions and 1 deletions

View File

@@ -10769,6 +10769,10 @@ void Oam::mountDBRoot(dbrootList dbrootConfigList, bool mount)
} }
catch (...) {} catch (...) {}
// nothing to do here
if (DBRootStorageType == "storagemanager")
return;
string DataRedundancyConfig = "n"; string DataRedundancyConfig = "n";
try try

View File

@@ -1898,6 +1898,7 @@ void pingDeviceThread()
{ {
DBRootConfigList::iterator pt = dbrootConfigList.begin(); DBRootConfigList::iterator pt = dbrootConfigList.begin();
// StorageManager: Need to do this for storagemanager as well? What's it doing?
if (( DBRootStorageType == "DataRedundancy") && (*pt == 1)) if (( DBRootStorageType == "DataRedundancy") && (*pt == 1))
{ {
log.writeLog(__LINE__, "stopModule, " + config.moduleName(), LOG_TYPE_DEBUG); log.writeLog(__LINE__, "stopModule, " + config.moduleName(), LOG_TYPE_DEBUG);

View File

@@ -6100,7 +6100,7 @@ void ProcessMonitor::unmountExtraDBroots()
{ {
oam.getSystemConfig("DBRootStorageType", DBRootStorageType); oam.getSystemConfig("DBRootStorageType", DBRootStorageType);
if ( DBRootStorageType == "hdfs" || if ( DBRootStorageType == "hdfs" || DBRootStorageType == "storagemanager" ||
( DBRootStorageType == "internal" && DataRedundancyConfig == "n") ) ( DBRootStorageType == "internal" && DataRedundancyConfig == "n") )
return; return;
} }