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 16:38:10 -05:00
parent 010c3d08b1
commit aad09ed57b
4 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
oam/etc/Calpont.xml
View File

@ -441,7 +441,7 @@
<UMStorageType>internal</UMStorageType> <UMStorageType>internal</UMStorageType>
<EEPackageType>rpm</EEPackageType> <EEPackageType>rpm</EEPackageType>
<SystemLogConfigFile>unassigned</SystemLogConfigFile> <SystemLogConfigFile>unassigned</SystemLogConfigFile>
<rpw>unassigned</rpw> <rpw>root</rpw>
<Cloud>unassigned</Cloud> <Cloud>unassigned</Cloud>
<AmazonAccessKey>unassigned</AmazonAccessKey> <AmazonAccessKey>unassigned</AmazonAccessKey>
<AmazonSecretKey>unassigned</AmazonSecretKey> <AmazonSecretKey>unassigned</AmazonSecretKey>
@ -468,6 +468,7 @@
<JavaPath>unassigned</JavaPath> <JavaPath>unassigned</JavaPath>
<MySQLPort>3306</MySQLPort> <MySQLPort>3306</MySQLPort>
<MySQLPasswordConfig>unassigned</MySQLPasswordConfig> <MySQLPasswordConfig>unassigned</MySQLPasswordConfig>
<AmazonDeviceName>/dev/xvd</AmazonDeviceName>
</Installation> </Installation>
<ExtentMap> <ExtentMap>
<!-- <!--

11
oam/oamcpp/liboamcpp.cpp
View File

@ -6904,7 +6904,6 @@ 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"};
/*************************************************************************** /***************************************************************************
@ -6917,6 +6916,16 @@ namespace oam
storageID_t Oam::getAWSdeviceName( const int dbrootid) storageID_t Oam::getAWSdeviceName( const int dbrootid)
{ {
string amazondeviceName = "/dev/xvd";
try {
getSystemConfig( "AmazonDeviceName", amazondeviceName );
}
catch(...)
{}
if ( amazondeviceName.empty() || amazondeviceName == "" )
amazondeviceName = "/dev/xvd";
//calulate id numbers from DBRoot ID //calulate id numbers from DBRoot ID
int lid = (dbrootid-1) / 10; int lid = (dbrootid-1) / 10;
int did = dbrootid - (dbrootid * lid); int did = dbrootid - (dbrootid * lid);

38
procmgr/processmanager.cpp
View File

@ -4561,10 +4561,27 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
return API_FAILURE; return API_FAILURE;
} }
// add instance tag
string systemName;
string AmazonAutoTagging;
{
try{
oam.getSystemConfig("SystemName", systemName);
oam.getSystemConfig("AmazonAutoTagging", AmazonAutoTagging);
}
catch(...) {}
}
if ( AmazonAutoTagging == "y" )
{
string tagValue = systemName + "-" + moduleName;
oam.createEC2tag( hostName, "Name", tagValue );
}
//wait until login is success until continuing or fail if can't login //wait until login is success until continuing or fail if can't login
log.writeLog(__LINE__, "addModule - Successfully Launch of new Instance, retry login test: " + moduleName, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "addModule - Successfully Launch of new Instance, retry login test: " + moduleName, LOG_TYPE_DEBUG);
int retry = 0; int retry = 0;
for ( ; retry < 60 ; retry++) for ( ; retry < 18 ; retry++)
{ {
IPAddr = oam.getEC2InstanceIpAddress(hostName); IPAddr = oam.getEC2InstanceIpAddress(hostName);
if (IPAddr == "terminated") { if (IPAddr == "terminated") {
@ -4597,7 +4614,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
break; break;
} }
if ( retry >= 60 ) if ( retry >= 18 )
{ {
log.writeLog(__LINE__, "addModule - Failed to log in to Instance: " + hostName, LOG_TYPE_ERROR); log.writeLog(__LINE__, "addModule - Failed to log in to Instance: " + hostName, LOG_TYPE_ERROR);
pthread_mutex_unlock(&THREAD_LOCK); pthread_mutex_unlock(&THREAD_LOCK);
@ -4606,23 +4623,6 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
log.writeLog(__LINE__, "addModule - Successful loggin: " + hostName, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "addModule - Successful loggin: " + hostName, LOG_TYPE_DEBUG);
// add instance tag
string systemName;
string AmazonAutoTagging;
{
try{
oam.getSystemConfig("SystemName", systemName);
oam.getSystemConfig("AmazonAutoTagging", AmazonAutoTagging);
}
catch(...) {}
}
if ( AmazonAutoTagging == "y" )
{
string tagValue = systemName + "-" + moduleName;
oam.createEC2tag( hostName, "Name", tagValue );
}
log.writeLog(__LINE__, "addModule - Launched new Instance: " + hostName + "/" + IPAddr, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "addModule - Launched new Instance: " + hostName + "/" + IPAddr, LOG_TYPE_DEBUG);
(*pt1).HostName = hostName; (*pt1).HostName = hostName;

4
tools/configMgt/autoConfigure.cpp
View File

@ -1302,7 +1302,7 @@ int main(int argc, char *argv[])
string AmazonRegion; string AmazonRegion;
string AmazonZone; string AmazonZone;
string AmazonVPCNextPrivateIP; string AmazonVPCNextPrivateIP;
string AmazonDeviceName;
try { try {
cloud = sysConfigOld->getConfig(InstallSection, "Cloud"); cloud = sysConfigOld->getConfig(InstallSection, "Cloud");
x509Cert = sysConfigOld->getConfig(InstallSection, "AmazonX509Certificate"); x509Cert = sysConfigOld->getConfig(InstallSection, "AmazonX509Certificate");
@ -1319,6 +1319,7 @@ int main(int argc, char *argv[])
AmazonZone = sysConfigOld->getConfig(InstallSection, "AmazonZone"); AmazonZone = sysConfigOld->getConfig(InstallSection, "AmazonZone");
AmazonVPCNextPrivateIP = sysConfigOld->getConfig(InstallSection, "AmazonVPCNextPrivateIP"); AmazonVPCNextPrivateIP = sysConfigOld->getConfig(InstallSection, "AmazonVPCNextPrivateIP");
AmazonSubNetID = sysConfigOld->getConfig(InstallSection, "AmazonSubNetID"); AmazonSubNetID = sysConfigOld->getConfig(InstallSection, "AmazonSubNetID");
AmazonDeviceName = sysConfigOld->getConfig(InstallSection, "AmazonDeviceName");
} }
catch(...) catch(...)
{ } { }
@ -1380,6 +1381,7 @@ int main(int argc, char *argv[])
sysConfigNew->setConfig(InstallSection, "AmazonAutoTagging", AmazonAutoTagging); sysConfigNew->setConfig(InstallSection, "AmazonAutoTagging", AmazonAutoTagging);
sysConfigNew->setConfig(InstallSection, "AmazonRegion", AmazonRegion); sysConfigNew->setConfig(InstallSection, "AmazonRegion", AmazonRegion);
sysConfigNew->setConfig(InstallSection, "AmazonZone", AmazonZone); sysConfigNew->setConfig(InstallSection, "AmazonZone", AmazonZone);
sysConfigNew->setConfig(InstallSection, "AmazonDeviceName", AmazonDeviceName);
} }
catch(...) catch(...)
{ {