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

Merge pull request #237 from mariadb-corporation/MCOL-519-Fixes

Browse Source 
Mcol 519 fixes
This commit is contained in:
david hill
2017-08-11 09:33:21 -05:00
committed by GitHub
parent 003742f7ac ace37e882f
commit a78db0f021
11 changed files with 222 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
oam/oamcpp/liboamcpp.cpp
View File

@@ -5203,13 +5203,13 @@ namespace oam
writeLog("manualMovePmDbroot: " + dbrootIDs + " from " + residePM + " to " + toPM, LOG_TYPE_DEBUG );
string GlusterConfig = "n";
string DataRedundancyConfig = "n";
try {
getSystemConfig( "GlusterConfig", GlusterConfig);
getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig);
}
catch(...)
{
GlusterConfig = "n";
DataRedundancyConfig = "n";
}
boost::char_separator<char> sep(", ");
@@ -5219,7 +5219,7 @@ namespace oam
++it)
{
//if gluster, check if there are copies on the to-pm
if ( GlusterConfig == "y")
if ( DataRedundancyConfig == "y")
{
string pmList = "";
try {
@@ -5381,7 +5381,7 @@ namespace oam
}
//if Gluster, do the assign command
if ( GlusterConfig == "y")
if ( DataRedundancyConfig == "y")
{
try {
string errmsg;
@@ -5477,16 +5477,16 @@ namespace oam
}
catch(...) {}
string GlusterConfig = "n";
string DataRedundancyConfig = "n";
try {
getSystemConfig( "GlusterConfig", GlusterConfig);
getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig);
}
catch(...)
{
GlusterConfig = "n";
DataRedundancyConfig = "n";
}
if (DBRootStorageType == "internal" && GlusterConfig == "n")
if (DBRootStorageType == "internal" && DataRedundancyConfig == "n")
return 1;
// get current Module name
@@ -5621,7 +5621,7 @@ namespace oam
exceptionControl("autoMovePmDbroot", API_FAILURE);
}
if ( GlusterConfig == "y")
if ( DataRedundancyConfig == "y")
{
try {
string errmsg;
@@ -5667,7 +5667,7 @@ namespace oam
{
//if Gluster, get it's list for DBroot and move to one of those
string toPmID;
if ( GlusterConfig == "y")
if ( DataRedundancyConfig == "y")
{
string pmList = "";
try {
@@ -5892,16 +5892,16 @@ namespace oam
}
catch(...) {}
string GlusterConfig = "n";
string DataRedundancyConfig = "n";
try {
getSystemConfig( "GlusterConfig", GlusterConfig);
getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig);
}
catch(...)
{
GlusterConfig = "n";
DataRedundancyConfig = "n";
}
if (DBRootStorageType == "internal" && GlusterConfig == "n")
if (DBRootStorageType == "internal" && DataRedundancyConfig == "n")
return 1;
//store in move dbroot transaction file
@@ -6480,13 +6480,13 @@ namespace oam
cout << endl << "Changes being applied" << endl << endl;
//added entered dbroot IDs to to-PM list and do Gluster assign if needed
string GlusterConfig = "n";
string DataRedundancyConfig = "n";
try {
getSystemConfig( "GlusterConfig", GlusterConfig);
getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig);
}
catch(...)
{
GlusterConfig = "n";
DataRedundancyConfig = "n";
}
DBRootConfigList::iterator pt3 = dbrootlist.begin();
@@ -6494,7 +6494,7 @@ namespace oam
{
todbrootConfigList.push_back(*pt3);
/* if ( GlusterConfig == "y")
/* if ( DataRedundancyConfig == "y")
{
try {
string errmsg;
@@ -6828,12 +6828,12 @@ namespace oam
int SystemDBRootCount = 0;
string cloud;
string DBRootStorageType;
string GlusterConfig = "n";
string DataRedundancyConfig = "n";
try {
getSystemConfig("DBRootCount", SystemDBRootCount);
getSystemConfig("Cloud", cloud);
getSystemConfig("DBRootStorageType", DBRootStorageType);
getSystemConfig("GlusterConfig", GlusterConfig);
getSystemConfig("DataRedundancyConfig", DataRedundancyConfig);
}
catch(...) {}
@@ -6919,7 +6919,7 @@ namespace oam
}
// if gluster, request volume delete
if ( GlusterConfig == "y")
if ( DataRedundancyConfig == "y")
{
try {
string errmsg1;
@@ -8284,7 +8284,7 @@ namespace oam
int numberDBRootsPerPM = numberNewDBRoots/numberNewPMs;
std::vector<int> dbrootPms[dbrootCount];
DataRedundancyConfig DataRedundancyConfigs[numberPMs];
DataRedundancySetup DataRedundancyConfigs[numberPMs];
int startDBRootID = dbrootID;
for (int pm=(pmID-1); pm < numberPMs; pm++,startDBRootID++)
@@ -9605,18 +9605,18 @@ namespace oam
}
catch(...) {}
string GlusterConfig = "n";
string DataRedundancyConfig = "n";
try {
getSystemConfig( "GlusterConfig", GlusterConfig);
getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig);
}
catch(...)
{
GlusterConfig = "n";
DataRedundancyConfig = "n";
}
if ( (DBRootStorageType == "external" && GlusterConfig == "n")
if ( (DBRootStorageType == "external" && DataRedundancyConfig == "n")
||
(GlusterConfig == "y" && !mount) )
(DataRedundancyConfig == "y" && !mount) )
{
dbrootList::iterator pt3 = dbrootConfigList.begin();
for( ; pt3 != dbrootConfigList.end() ; pt3++)