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

update fstab changes

Browse Source
This commit is contained in:
david hill
2016-04-20 15:58:11 -05:00
parent 26c4dd5982
commit 010c3d08b1
4 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
oam/oamcpp/liboamcpp.cpp
View File

@ -6198,20 +6198,13 @@ namespace oam
}
catch(...)
{}
//update /etc/fstab with mount
string entry = amazonDeviceName + " " + InstallDir + "/data" + itoa(*pt1) + " ext2 noatime,nodiratime,noauto 0 0";
//update local fstab
cmd = "echo " + entry + " >> /etc/fstab";
system(cmd.c_str());
//use from addmodule later
cmd = "echo " + entry + " >> " + InstallDir + "/local/etc/pm1/fstab";
system(cmd.c_str());
// fstabs
string entry = updateFstab( amazonDeviceName, itoa(*pt1));
//send update pms
distributeFstabUpdates(entry);
if (entry != "" )
distributeFstabUpdates(entry);
}
}
@ -8467,6 +8460,36 @@ namespace oam
}
/******************************************************************************************
* @brief updateFstab
*
* purpose: check and get mysql user password
*
******************************************************************************************/
std::string Oam::updateFstab(std::string device, std::string dbrootID)
{
//check if entry already exist
string cmd = "grep /data" + dbrootID + " > /etc/fstab /dev/null 2>&1";
int status = system(cmd.c_str());
if (WEXITSTATUS(status) == 0 )
return "";
//update /etc/fstab with mount
string entry = device + " " + InstallDir + "/data" + dbrootID + " ext2 noatime,nodiratime,noauto 0 0";
//update local fstab
cmd = "echo " + entry + " >> /etc/fstab";
system(cmd.c_str());
//use from addmodule later
cmd = "echo " + entry + " >> " + InstallDir + "/local/etc/pm1/fstab";
system(cmd.c_str());
return entry;
}
/***************************************************************************
* PRIVATE FUNCTIONS
***************************************************************************/

4
oam/oamcpp/liboamcpp.h
View File

@ -2436,6 +2436,10 @@ namespace oam
*/
EXPORT std::string getMySQLPassword(bool bypassConfig = false);
/** @brief update fstab with dbroot mounts
*/
EXPORT std::string updateFstab(std::string device, std::string dbrootID);
private:
int sendMsgToProcMgr3(messageqcpp::ByteStream::byte requestType, snmpmanager::AlarmList& alarmlist, const std::string date);

2
oamapps/calpontConsole/calpontConsole.cpp
View File

@ -1723,7 +1723,7 @@ int processCommand(string* arguments)
cout << endl;
oam.getSystemConfig("PMVolumeSize", EBSsize);
string prompt = "Enter EBS storage size in GB: (" + EBSsize + "): ";
string prompt = "Enter EBS storage size in GB, current setting is " + EBSsize + " : ";
EBSsize = dataPrompt(prompt);
}
}

24
oamapps/postConfigure/postConfigure.cpp
View File

@ -2526,16 +2526,8 @@ int main(int argc, char *argv[])
deviceName = boost::get<0>(st);
amazondeviceName = boost::get<1>(st);
//update /etc/fstab with mount
string entry = amazondeviceName + " " + installDir + "/data" + *it + " ext2 noatime,nodiratime,noauto 0 0";
//update local fstab
cmd = "echo " + entry + " >> /etc/fstab";
system(cmd.c_str());
//use from addmodule later
cmd = "echo " + entry + " >> " + installDir + "/local/etc/pm1/fstab";
system(cmd.c_str());
// fstabs
string entry = oam.updateFstab( amazondeviceName, *it);
}
else
{
@ -2573,16 +2565,8 @@ int main(int argc, char *argv[])
callFree(pcommand);
}
//update /etc/fstab with mount
string entry = amazondeviceName + " " + installDir + "/data" + *it + " ext2 noatime,nodiratime,noauto 0 0";
//update local fstab
cmd = "echo " + entry + " >> /etc/fstab";
system(cmd.c_str());
//use from addmodule later
cmd = "echo " + entry + " >> " + installDir + "/local/etc/pm1/fstab";
system(cmd.c_str());
// fstabs
string entry = oam.updateFstab( amazondeviceName, *it);
}