database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-12 23:42:47 +03:00
Code Activity

add fix for dbroot id on add and add getlocalinstance info

Browse Source
This commit is contained in:
david hill
2016-04-18 10:26:12 -05:00
parent bfa03e99eb
commit ae2f6092de
1 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
oamapps/postConfigure/postConfigure.cpp
View File

@@ -1758,8 +1758,23 @@ int main(int argc, char *argv[])
while (true) while (true)
{ {
newModuleHostName = moduleHostName; newModuleHostName = moduleHostName;
if (cloud == "amazon") if (cloud == "amazon") {
if ( moduleHostName == oam::UnassignedName &&
moduleNameDesc == "pm1" )
{
//get local instance name (pm1)
string localInstance = oam.getEC2LocalInstance();
if ( localInstance == "failed" || localInstance.empty() || localInstance == "")
moduleHostName == oam::UnassignedName;
else
{
moduleHostName == localInstance;
}
}
prompt = "Enter EC2 Instance ID (" + moduleHostName + ") > "; prompt = "Enter EC2 Instance ID (" + moduleHostName + ") > ";
}
else else
prompt = "Enter Nic Interface #" + oam.itoa(nicID) + " Host Name (" + moduleHostName + ") > "; prompt = "Enter Nic Interface #" + oam.itoa(nicID) + " Host Name (" + moduleHostName + ") > ";
@@ -1796,6 +1811,24 @@ int main(int argc, char *argv[])
//check Instance ID and get IP Address if running //check Instance ID and get IP Address if running
if (cloud == "amazon") { if (cloud == "amazon") {
string instanceType = oam.getEC2LocalInstanceType(newModuleHostName);
if ( moduleType == "pm" )
{
try {
sysConfig->setConfig(InstallSection, "PMInstanceType", instanceType);
}
catch(...)
{}
}
else
{
try {
sysConfig->setConfig(InstallSection, "UMInstanceType", instanceType);
}
catch(...)
{}
}
cout << "Getting Private IP Address for Instance " << newModuleHostName << ", please wait..." << endl; cout << "Getting Private IP Address for Instance " << newModuleHostName << ", please wait..." << endl;
newModuleIPAddr = oam.getEC2InstanceIpAddress(newModuleHostName); newModuleIPAddr = oam.getEC2InstanceIpAddress(newModuleHostName);
if (newModuleIPAddr == "stopped") { if (newModuleIPAddr == "stopped") {
@@ -2486,7 +2519,7 @@ int main(int argc, char *argv[])
try try
{ {
DBRootConfigList dbrootlist; DBRootConfigList dbrootlist;
dbrootlist.push_back(atoi(DBrootID.c_str())); dbrootlist.push_back(atoi((*it).c_str()));
oam.addDbroot(1, dbrootlist, PMVolumeSize); oam.addDbroot(1, dbrootlist, PMVolumeSize);