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

change code for amazon storaeg device name

Browse Source
This commit is contained in:
david hill
2016-04-18 16:57:21 -05:00
parent 45cdae50df
commit 484d36cb31
3 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
oam/oamcpp/liboamcpp.cpp
View File

@ -6156,7 +6156,7 @@ namespace oam
catch(...) {} catch(...) {}
string deviceName = boost::get<0>(st); string deviceName = boost::get<0>(st);
string labelName = boost::get<1>(st); string amazonDeviceName = boost::get<1>(st);
//attach volumes to local instance //attach volumes to local instance
retry = 0; retry = 0;
@ -6177,7 +6177,7 @@ namespace oam
//format attached volume //format attached volume
cout << " Formatting DBRoot #" << itoa(*pt1) << ", please wait..." << endl; cout << " Formatting DBRoot #" << itoa(*pt1) << ", please wait..." << endl;
string cmd = "mkfs.ext2 -F " + deviceName + " " + "-L " + labelName + " > /tmp/format.log 2>&1"; string cmd = "mkfs.ext2 -F " + amazonDeviceName + " > /tmp/format.log 2>&1";
writeLog("addDbroot format cmd: " + cmd, LOG_TYPE_DEBUG ); writeLog("addDbroot format cmd: " + cmd, LOG_TYPE_DEBUG );
@ -6188,17 +6188,19 @@ namespace oam
string volumeNameID = "PMVolumeName" + itoa(*pt1); string volumeNameID = "PMVolumeName" + itoa(*pt1);
string deviceNameID = "PMVolumeDeviceName" + itoa(*pt1); string deviceNameID = "PMVolumeDeviceName" + itoa(*pt1);
string amazonDeviceNameID = "PMVolumeAmazonDeviceName" + itoa(*pt1);
//write volume and device name //write volume and device name
try { try {
sysConfig->setConfig(Section, volumeNameID, volumeName); sysConfig->setConfig(Section, volumeNameID, volumeName);
sysConfig->setConfig(Section, deviceNameID, labelName); sysConfig->setConfig(Section, deviceNameID, deviceName);
sysConfig->setConfig(Section, amazonDeviceNameID, amazonDeviceName);
} }
catch(...) catch(...)
{} {}
//update /etc/fstab with mount //update /etc/fstab with mount
string entry = labelName + " " + InstallDir + "/data" + itoa(*pt1) + " ext2 noatime,nodiratime,noauto 0 0"; string entry = amazonDeviceName + " " + InstallDir + "/data" + itoa(*pt1) + " ext2 noatime,nodiratime,noauto 0 0";
//use from addmodule later //use from addmodule later
cmd = "echo " + entry + " >> " + InstallDir + "/local/etc/pm1/fstab"; cmd = "echo " + entry + " >> " + InstallDir + "/local/etc/pm1/fstab";
@ -6895,6 +6897,7 @@ namespace oam
//current amazon max dbroot id support = 190; //current amazon max dbroot id support = 190;
string PMdeviceName = "/dev/sd"; string PMdeviceName = "/dev/sd";
string amazondeviceName = "/dev/xvd";
string deviceLetter[] = {"g","h","i","j","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","end"}; string deviceLetter[] = {"g","h","i","j","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","end"};
/*************************************************************************** /***************************************************************************
@ -6911,7 +6914,7 @@ namespace oam
int lid = (dbrootid-1) / 10; int lid = (dbrootid-1) / 10;
int did = dbrootid - (dbrootid * lid); int did = dbrootid - (dbrootid * lid);
return boost::make_tuple(PMdeviceName + deviceLetter[lid] + itoa(did), "LABEL=DBROOT" + itoa(dbrootid)); return boost::make_tuple(PMdeviceName + deviceLetter[lid] + itoa(did), amazondeviceName + deviceLetter[lid] + itoa(did));
} }
/*************************************************************************** /***************************************************************************

3
oamapps/postConfigure/postConfigure.cpp
View File

@ -2490,7 +2490,6 @@ int main(int argc, char *argv[])
if ( noPrompting ) if ( noPrompting )
exit(1); exit(1);
} }
string volumeNameID = "PMVolumeName" + *it; string volumeNameID = "PMVolumeName" + *it;
string volumeName = oam::UnassignedName; string volumeName = oam::UnassignedName;
@ -2503,7 +2502,6 @@ int main(int argc, char *argv[])
catch(...) catch(...)
{} {}
if ( create == "n" ) { if ( create == "n" ) {
prompt = "Enter Volume ID for '" + DBrootID + "' (" + volumeName + ") > "; prompt = "Enter Volume ID for '" + DBrootID + "' (" + volumeName + ") > ";
pcommand = callReadline(prompt.c_str()); pcommand = callReadline(prompt.c_str());
@ -2512,7 +2510,6 @@ int main(int argc, char *argv[])
if (strlen(pcommand) > 0) volumeName = pcommand; if (strlen(pcommand) > 0) volumeName = pcommand;
callFree(pcommand); callFree(pcommand);
} }
} }
else else
{ {

23
tools/configMgt/autoConfigure.cpp
View File

@ -1456,9 +1456,13 @@ int main(int argc, char *argv[])
string volumeName = oam::UnassignedName; string volumeName = oam::UnassignedName;
string deviceNameID = "PMVolumeDeviceName" + oam.itoa(id); string deviceNameID = "PMVolumeDeviceName" + oam.itoa(id);
string deviceName = oam::UnassignedName; string deviceName = oam::UnassignedName;
string amazondeviceNameID = "PMVolumeAmazonDeviceName" + oam.itoa(id);
string amazondeviceName = oam::UnassignedName;
try { try {
volumeName = sysConfigOld->getConfig(InstallSection, volumeNameID); volumeName = sysConfigOld->getConfig(InstallSection, volumeNameID);
deviceName = sysConfigOld->getConfig(InstallSection, deviceNameID); deviceName = sysConfigOld->getConfig(InstallSection, deviceNameID);
amazondeviceName = sysConfigOld->getConfig(InstallSection, amazondeviceNameID);
} }
catch(...) catch(...)
{} {}
@ -1466,6 +1470,25 @@ int main(int argc, char *argv[])
try { try {
sysConfigNew->setConfig(InstallSection, volumeNameID, volumeName); sysConfigNew->setConfig(InstallSection, volumeNameID, volumeName);
sysConfigNew->setConfig(InstallSection, deviceNameID, deviceName); sysConfigNew->setConfig(InstallSection, deviceNameID, deviceName);
sysConfigNew->setConfig(InstallSection, amazondeviceNameID, amazondeviceName);
}
catch(...)
{}
string UMVolumeSize = oam::UnassignedName;
string PMVolumeSize = oam::UnassignedName;
try {
UMVolumeSize = sysConfigOld->getConfig(InstallSection, "UMVolumeSize");
PMVolumeSize = sysConfigOld->getConfig(InstallSection, "PMVolumeSize");
}
catch(...)
{}
try {
sysConfigNew->setConfig(InstallSection, "UMVolumeSize", UMVolumeSize);
sysConfigNew->setConfig(InstallSection, "PMVolumeSize", PMVolumeSize);
} }
catch(...) catch(...)
{} {}