database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-12 11:01:17 +03:00
Code Activity

Merge branch 'develop-1.2' into develop-merge-up-20190514

Browse Source
This commit is contained in:
Andrew Hutchings
2019-05-14 13:58:33 +01:00
parent 6c4afdf18b 0dd33c6f75
commit 020b211bb7
83 changed files with 469 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
oamapps/postConfigure/postConfigure.cpp
View File

@@ -273,9 +273,7 @@ int main(int argc, char* argv[])
//check if root-user
int user;
int usergroup;
user = getuid();
usergroup = getgid();
string SUDO = "";
if (user != 0)
@@ -1413,7 +1411,7 @@ int main(int argc, char* argv[])
{
string amazonLog = tmpDir + "/amazon.log";
string cmd = "aws --version > " + amazonLog + " 2>&1";
int rtnCode = system(cmd.c_str());
system(cmd.c_str());
ifstream in(amazonLog.c_str());
@@ -1974,7 +1972,7 @@ int main(int argc, char* argv[])
}
}
unsigned int maxPMNicCount = 1;
int maxPMNicCount = 1;
//configure module type
bool parentOAMmoduleConfig = false;
@@ -2111,7 +2109,7 @@ int main(int argc, char* argv[])
//clear any Equipped Module IP addresses that aren't in current ID range
for ( int j = 0 ; j < listSize ; j++ )
{
for ( unsigned int k = 1 ; k < MaxNicID+1 ; k++)
for ( int k = 1 ; k < MaxNicID+1 ; k++)
{
string ModuleIPAddr = "ModuleIPAddr" + oam.itoa(j + 1) + "-" + oam.itoa(k) + "-" + oam.itoa(i + 1);
@@ -2185,8 +2183,7 @@ int main(int argc, char* argv[])
}
}
}
unsigned int nicID=1;
int nicID=1;
for( ; nicID < MaxNicID +1 ; nicID++ )
{
if ( !found )
@@ -3547,7 +3544,7 @@ int main(int argc, char* argv[])
for ( int pmsID = 1; pmsID < pmPorts + 1 ; )
{
for (unsigned int j = 1 ; j < maxPMNicCount + 1 ; j++)
for (int j = 1 ; j < maxPMNicCount + 1 ; j++)
{
PerformanceModuleList::iterator list1 = performancemodulelist.begin();
@@ -4008,9 +4005,11 @@ int main(int argc, char* argv[])
break;
}
if ( pass1 == "exit")
if ( strncmp(pass1, "exit", 4) )
{
exit(0);
}
string p1 = pass1;
pass2 = getpass("Confirm password > ");
string p2 = pass2;
@@ -6418,7 +6417,6 @@ bool glusterSetup(string password, bool doNotResolveHostNames)
Oam oam;
int dataRedundancyCopies = 0;
int dataRedundancyNetwork = 0;
int dataRedundancyStorage = 0;
int numberDBRootsPerPM = DBRootCount / pmNumber;
int numberBricksPM = 0;
std::vector<int> dbrootPms[DBRootCount];