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

MCOL-520 gluster changes

Browse Source
This commit is contained in:
David Hill
2018-10-24 14:17:16 -05:00
parent 29d83043d3
commit 2e2ef03602
2 changed files with 110 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
oam/oamcpp/liboamcpp.cpp
View File

@@ -8797,11 +8797,12 @@ int Oam::glusterctl(GLUSTER_COMMANDS command, std::string argument1, std::string
user = getuid(); user = getuid();
group = getgid(); group = getgid();
string SUDO = ""; string glustercmd = "gluster ";
if ( user != 0 )
SUDO = "sudo ";
string glustercmd = SUDO + "gluster "; if (user != 0)
{
glustercmd = "sudo " + glustercmd;
}
errmsg = ""; errmsg = "";
@@ -8995,14 +8996,12 @@ int Oam::glusterctl(GLUSTER_COMMANDS command, std::string argument1, std::string
for (int pm = (pmID - 1); pm < numberPMs; pm++) for (int pm = (pmID - 1); pm < numberPMs; pm++)
{ {
cout << "gluster peer probe " + DataRedundancyConfigs[pm].pmIpAddr << endl; cout << "gluster peer probe " + DataRedundancyConfigs[pm].pmIpAddr << endl;
cout << command << endl;
status = system(command.c_str()); status = system(command.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
{ {
cout << "ERROR: peer probe command failed." << endl; cout << "ERROR: peer probe command failed." << endl;
command = InstallDir + "/bin/remote_command.sh " + DataRedundancyConfigs[pm].pmIpAddr + " " + password + " 'stat /var/run/glusterd.pid > /dev/null 2>&1'"; command = InstallDir + "/bin/remote_command.sh " + DataRedundancyConfigs[pm].pmIpAddr + " " + password + " 'stat /var/run/glusterd.pid > /dev/null 2>&1'";
cout << command << endl;
status = system(command.c_str()); status = system(command.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
@@ -9016,8 +9015,7 @@ cout << command << endl;
} }
sleep(5); sleep(5);
command = glustercmd + "peer status " + " >> " + tmpdir + "/glusterCommands.log 2>&1"; command = glustercmd + "peer status " + " >> /tmp/glusterCommands.txt 2>&1";
cout << command << endl;
status = system(command.c_str()); status = system(command.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
@@ -9050,9 +9048,8 @@ cout << command << endl;
pmnextbrick[pm]++; pmnextbrick[pm]++;
} }
command += "force >> " + tmpdir + "/glusterCommands.log 2>&1"; command += "force >> /tmp/glusterCommands.txt 2>&1";
cout << "Gluster create and start volume dbroot" << itoa(newDbrootID) << "..."; cout << "Gluster create and start volume dbroot" << itoa(newDbrootID) << "...";
cout << command << endl;
status = system(command.c_str()); status = system(command.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
@@ -9063,8 +9060,7 @@ cout << command << endl;
if (user != 0) if (user != 0)
{ {
command = SUDO + "gluster volume set dbroot" + itoa(newDbrootID) + " storage.owner-uid " + itoa(user) + " >> " + tmpdir + "/glusterCommands.log 2>&1";; command = "sudo gluster volume set dbroot" + itoa(newDbrootID) + " storage.owner-uid " + itoa(user) + " >> /tmp/glusterCommands.txt 2>&1";;
cout << command << endl;
status = system(command.c_str()); status = system(command.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
@@ -9073,8 +9069,7 @@ cout << command << endl;
exceptionControl("GLUSTER_ADD", API_FAILURE); exceptionControl("GLUSTER_ADD", API_FAILURE);
} }
command = SUDO + "gluster volume set dbroot" + itoa(newDbrootID) + " storage.owner-gid " + itoa(group) + " >> " + tmpdir + "/glusterCommands.log 2>&1";; command = "sudo gluster volume set dbroot" + itoa(newDbrootID) + " storage.owner-gid " + itoa(group) + " >> /tmp/glusterCommands.txt 2>&1";;
cout << command << endl;
status = system(command.c_str()); status = system(command.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
@@ -9084,8 +9079,7 @@ cout << command << endl;
} }
} }
command = glustercmd + "volume start dbroot" + itoa(newDbrootID) + " >> " + tmpdir + "/glusterCommands.log 2>&1"; command = glustercmd + "volume start dbroot" + itoa(newDbrootID) + " >> /tmp/glusterCommands.txt 2>&1";
cout << command << endl;
status = system(command.c_str()); status = system(command.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
@@ -9132,9 +9126,8 @@ cout << command << endl;
int status; int status;
writeLog("glusterctl: GLUSTER_DELETE: dbroot = " + dbrootID, LOG_TYPE_DEBUG ); writeLog("glusterctl: GLUSTER_DELETE: dbroot = " + dbrootID, LOG_TYPE_DEBUG );
command = glustercmd + "--mode=script volume stop dbroot" + dbrootID + " >> " + tmpdir + "/glusterCommands.log 2>&1"; command = glustercmd + "--mode=script volume stop dbroot" + dbrootID + " >> /tmp/glusterCommands.txt 2>&1";
cout << command << endl;
status = system(command.c_str()); status = system(command.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
@@ -9146,9 +9139,8 @@ cout << command << endl;
// give time for transaction to finish after stopping // give time for transaction to finish after stopping
sleep(10); sleep(10);
command = glustercmd + " --mode=script volume delete dbroot" + dbrootID + " >> " + tmpdir + "/glusterCommands.log 2>&1"; command = glustercmd + " --mode=script volume delete dbroot" + dbrootID + " >> /tmp/glusterCommands.txt 2>&1";
cout << command << endl;
status = system(command.c_str()); status = system(command.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
@@ -9167,17 +9159,15 @@ cout << command << endl;
string command = ""; string command = "";
int status; int status;
command = glustercmd + "peer probe " + ipAddress + " >> " + tmpdir + "/glusterCommands.log 2>&1"; command = glustercmd + "peer probe " + ipAddress + " >> /tmp/glusterCommands.txt 2>&1";
cout << "gluster peer probe " + ipAddress << endl; cout << "gluster peer probe " + ipAddress << endl;
cout << command << endl;
status = system(command.c_str()); status = system(command.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
{ {
cout << "ERROR: peer probe command failed." << endl; cout << "ERROR: peer probe command failed." << endl;
command = InstallDir + "/bin/remote_command.sh " + ipAddress + " " + password + " 'stat /var/run/glusterd.pid > /dev/null 2>&1'"; command = InstallDir + "/bin/remote_command.sh " + ipAddress + " " + password + " 'stat /var/run/glusterd.pid > /dev/null 2>&1'";
cout << command << endl;
status = system(command.c_str()); status = system(command.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )

115
oamapps/postConfigure/postConfigure.cpp
View File

@@ -5109,8 +5109,10 @@ bool storageSetup(bool amazonInstall)
//check if gluster is installed //check if gluster is installed
int rtnCode = 1; int rtnCode = 1;
string cmd = SUDO + "gluster --version > " + tmpDir + "/gluster.log 2>&1"; if (rootUser)
rtnCode = system(cmd.c_str()); rtnCode = system("gluster --version > /tmp/gluster.log 2>&1");
else
rtnCode = system("sudo gluster --version > /tmp/gluster.log 2>&1");
if (rtnCode == 0) if (rtnCode == 0)
{ {
@@ -5124,7 +5126,7 @@ bool storageSetup(bool amazonInstall)
//check if hadoop is installed //check if hadoop is installed
string hadoopLog = tmpDir + "/hadoop.log"; string hadoopLog = tmpDir + "/hadoop.log";
cmd = "which hadoop > " + hadoopLog + " 2>&1"; string cmd = "which hadoop > " + hadoopLog + " 2>&1";
system(cmd.c_str()); system(cmd.c_str());
ifstream in(hadoopLog.c_str()); ifstream in(hadoopLog.c_str());
@@ -6253,7 +6255,6 @@ std::string launchInstance(ModuleIP moduleip)
bool glusterSetup(string password) bool glusterSetup(string password)
{ {
Oam oam; Oam oam;
int dataRedundancyCopies = 0; int dataRedundancyCopies = 0;
int dataRedundancyNetwork = 0; int dataRedundancyNetwork = 0;
@@ -6693,6 +6694,66 @@ bool glusterSetup(string password)
cout << "ERROR: failed to make directory(" << DataRedundancyConfigs[pm].pmIpAddr << "): '" << command << "'" << endl; cout << "ERROR: failed to make directory(" << DataRedundancyConfigs[pm].pmIpAddr << "): '" << command << "'" << endl;
exit(1); exit(1);
} }
/*
if (dataRedundancyStorage == 2)
{
//walk data storage locations and modify fstab to reflect the storage locations entered by user
vector<DataRedundancyStorageSetup>::iterator storageSetupIter=DataRedundancyConfigs[pm].storageLocations.begin();
for (; storageSetupIter < DataRedundancyConfigs[pm].storageLocations.end(); storageSetupIter++ )
{
if (rootUser)
{
command = remoteCommand + DataRedundancyConfigs[pm].pmIpAddr + " " + password +
" 'echo " + (*storageSetupIter).storageLocation + " " +
installDir + "/gluster/brick" + oam.itoa(brick) + " " +
(*storageSetupIter).storageFilesytemType + " defaults 1 2 >> /etc/fstab'";
}
else
{
command = remoteCommand + DataRedundancyConfigs[pm].pmIpAddr + " " + password +
" 'sudo bash -c `sudo echo " + (*storageSetupIter).storageLocation + " " +
installDir + "/gluster/brick" + oam.itoa(brick) + " " +
(*storageSetupIter).storageFilesytemType + " defaults 1 2 >> /etc/fstab`'";
}
status = system(command.c_str());
if (WEXITSTATUS(status) != 0 )
{
cout << "ERROR: command failed: " << command << endl;
exit(1);
}
if (rootUser)
{
command = remoteCommand + DataRedundancyConfigs[pm].pmIpAddr + " " + password +
" 'mount " + installDir + "/gluster/brick" + oam.itoa(brick) + "'";
}
else
{
command = remoteCommand + DataRedundancyConfigs[pm].pmIpAddr + " " + password +
" 'sudo bash -c `sudo mount " + installDir + "/gluster/brick" + oam.itoa(brick) + "`'";
}
status = system(command.c_str());
if (WEXITSTATUS(status) != 0 )
{
cout << "ERROR: command failed: " << command << endl;
exit(1);
}
if (!rootUser)
{
int user;
user = getuid();
command = remoteCommand + DataRedundancyConfigs[pm].pmIpAddr + " " + password +
"'sudo bash -c `sudo chown -R " + oam.itoa(user) + ":" + oam.itoa(user) + " " + installDir + "/gluster/brick" + oam.itoa(brick) + "`'";
status = system(command.c_str());
if (WEXITSTATUS(status) != 0 )
{
cout << "ERROR(" << status <<"): command failed: " << command << endl;
}
}
}
}
*/
} }
string errmsg1; string errmsg1;
@@ -6707,12 +6768,17 @@ bool glusterSetup(string password)
sleep(5); sleep(5);
string glusterCommandsLog = tmpDir + "/glusterCommands.log"; if (rootUser)
{
command = "gluster peer status >> /tmp/glusterCommands.txt 2>&1";
}
else
{
command = "sudo gluster peer status >> /tmp/glusterCommands.txt 2>&1";
}
command = SUDO + "gluster peer status " + glusterCommandsLog + "2>&1";
cout << "pc " << command << endl;
status = system(command.c_str()); status = system(command.c_str());
cout << status << endl;
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
{ {
cout << "ERROR: peer status command failed." << endl; cout << "ERROR: peer status command failed." << endl;
@@ -6734,7 +6800,14 @@ cout << status << endl;
{ {
int dbrootID = db + 1; int dbrootID = db + 1;
command = SUDO + "gluster volume create dbroot" + oam.itoa(dbrootID) + " transport tcp replica " + oam.itoa(dataRedundancyCopies) + " "; if (rootUser)
{
command = "gluster volume create dbroot" + oam.itoa(dbrootID) + " transport tcp replica " + oam.itoa(dataRedundancyCopies) + " ";
}
else
{
command = "sudo gluster volume create dbroot" + oam.itoa(dbrootID) + " transport tcp replica " + oam.itoa(dataRedundancyCopies) + " ";
}
vector<int>::iterator dbrootPmIter = dbrootPms[db].begin(); vector<int>::iterator dbrootPmIter = dbrootPms[db].begin();
@@ -6745,15 +6818,13 @@ cout << status << endl;
pmnextbrick[pm]++; pmnextbrick[pm]++;
} }
command += "force >> " + glusterCommandsLog + " 2>&1"; command += "force >> /tmp/glusterCommands.txt 2>&1";
cout << "Gluster create and start volume dbroot" << oam.itoa(dbrootID) << "..."; cout << "Gluster create and start volume dbroot" << oam.itoa(dbrootID) << "...";
cout << "pc " << command << endl;
status = system(command.c_str()); status = system(command.c_str());
cout << status << endl;
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
{ {
if (oam.checkLogStatus(glusterCommandsLog, "dbroot" + oam.itoa(dbrootID) + " already exists" )) if (oam.checkLogStatus("/tmp/glusterCommands.txt", "dbroot" + oam.itoa(dbrootID) + " already exists" ))
{ {
string errmsg1; string errmsg1;
string errmsg2; string errmsg2;
@@ -6765,9 +6836,7 @@ cout << status << endl;
exit(1); exit(1);
} }
cout << "pc " << command << endl;
status = system(command.c_str()); status = system(command.c_str());
cout << status << endl;
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
{ {
@@ -6784,10 +6853,8 @@ cout << status << endl;
if (rootUser) if (rootUser)
{ {
command = "gluster volume start dbroot" + oam.itoa(dbrootID) + " >> " + glusterCommandsLog + " 2>&1"; command = "gluster volume start dbroot" + oam.itoa(dbrootID) + " >> /tmp/glusterCommands.txt 2>&1";
cout << "pc " << command << endl;
status = system(command.c_str()); status = system(command.c_str());
cout << status << endl;
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
{ {
@@ -6799,10 +6866,8 @@ cout << status << endl;
{ {
int user = getuid(); int user = getuid();
int group = getgid(); int group = getgid();
command = SUDO + "gluster volume set dbroot" + oam.itoa(dbrootID) + " storage.owner-uid " + oam.itoa(user) + " >> " + glusterCommandsLog + " 2>&1"; command = "sudo gluster volume set dbroot" + oam.itoa(dbrootID) + " storage.owner-uid " + oam.itoa(user) + " >> /tmp/glusterCommands.txt 2>&1";;
cout << "pc " << command << endl;
status = system(command.c_str()); status = system(command.c_str());
cout << status << endl;
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
{ {
@@ -6810,10 +6875,8 @@ cout << status << endl;
exit(1); exit(1);
} }
command = SUDO + "gluster volume set dbroot" + oam.itoa(dbrootID) + " storage.owner-gid " + oam.itoa(group) + " >> " + glusterCommandsLog + " 2>&1"; command = "sudo gluster volume set dbroot" + oam.itoa(dbrootID) + " storage.owner-gid " + oam.itoa(group) + " >> /tmp/glusterCommands.txt 2>&1";;
cout << "pc " << command << endl;
status = system(command.c_str()); status = system(command.c_str());
cout << status << endl;
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
{ {
@@ -6821,10 +6884,8 @@ cout << status << endl;
exit(1); exit(1);
} }
command = SUDO + "gluster volume start dbroot" + oam.itoa(dbrootID) + " >> " + glusterCommandsLog + " 2>&1"; command = "sudo gluster volume start dbroot" + oam.itoa(dbrootID) + " >> /tmp/glusterCommands.txt 2>&1";
cout << "pc " << command << endl;
status = system(command.c_str()); status = system(command.c_str());
cout << status << endl;
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
{ {