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-1.1' into develop

Browse Source
This commit is contained in:
Andrew Hutchings
2017-10-30 10:29:30 +00:00
parent f6060a2b9a 0139ae1745
commit a347a8f5aa
10 changed files with 74 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/configMgt/autoConfigure.cpp
View File

@ -220,12 +220,14 @@ int main(int argc, char* argv[])
string DataRedundancyConfig;
string DataRedundancyCopies;
string DataRedundancyStorageType;
string DataRedundancyNetworkType;
try
{
DataRedundancyConfig = sysConfigOld->getConfig(InstallSection, "DataRedundancyConfig");
DataRedundancyCopies = sysConfigOld->getConfig(InstallSection, "DataRedundancyCopies");
DataRedundancyStorageType = sysConfigOld->getConfig(InstallSection, "DataRedundancyStorageType");
DataRedundancyNetworkType = sysConfigOld->getConfig(InstallSection, "DataRedundancyNetworkType");
}
catch (...)
{}
@ -237,6 +239,7 @@ int main(int argc, char* argv[])
sysConfigNew->setConfig(InstallSection, "DataRedundancyConfig", DataRedundancyConfig);
sysConfigNew->setConfig(InstallSection, "DataRedundancyCopies", DataRedundancyCopies);
sysConfigNew->setConfig(InstallSection, "DataRedundancyStorageType", DataRedundancyStorageType);
sysConfigNew->setConfig(InstallSection, "DataRedundancyNetworkType", DataRedundancyNetworkType);
}
catch (...)
{}
@ -1650,6 +1653,24 @@ int main(int argc, char* argv[])
catch (...)
{}
}
if ( !DataRedundancyConfig.empty() )
{
try
{
string dbrootPMsID = "DBRoot" + oam.itoa(id) + "PMs";
string dbrootPMs = sysConfigOld->getConfig("DataRedundancyConfig", dbrootPMsID);
try
{
sysConfigNew->setConfig("DataRedundancyConfig", dbrootPMsID, dbrootPMs);
}
catch (...)
{}
}
catch (...)
{}
}
}
}
catch (exception& e)