database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Merge pull request #1004 from pleblanc1976/runtime-disable-oam

Browse Source 
Runtime disable oam
This commit is contained in:
Andrew Hutchings
2020-01-17 10:31:05 -08:00
committed by Patrick LeBlanc
parent a7724ac3c7
commit 5ff131e726
10 changed files with 81 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
oamapps/mcsadmin/mcsadmin.cpp
View File

@ -174,11 +174,12 @@ void setupSignalHandlers()
int main(int argc, char* argv[])
{
// print a warning if this is a developer build
#ifdef SKIP_OAM_INIT
cout << "SKIP_OAM_INIT is set" << endl;
sleep(2);
#endif
// print a warning if this is a developer build
if (getenv("SKIP_OAM_INIT"))
{
cout << "SKIP_OAM_INIT is set" << endl;
sleep(2);
}
#ifndef _MSC_VER
setuid(0); // set effective ID to root; ignore return status
@ -246,7 +247,7 @@ int main(int argc, char* argv[])
if (user != 0)
rootUser = false;
// create/open command log file if not created
logFile.open(DEFAULT_LOG_FILE.c_str(), ios::app);
@ -2622,7 +2623,7 @@ int processCommand(string* arguments)
if ( DBRootStorageType == "hdfs")
{
string logFile = tmpDir + "/cc-stop.pdsh";
cmd = "pdsh -a 'columnstore stop' > " + logFile + " 2>&1";
system(cmd.c_str());
@ -4932,7 +4933,7 @@ int processCommand(string* arguments)
case 39: // getSystemDirectories
{
cout << endl << "System Installation and Temporary File Directories" << endl << endl;
cout << "System Temporary File Directory = " << tmpDir << endl << endl;
}
break;
@ -5695,7 +5696,7 @@ int processCommand(string* arguments)
umStorageNames umstoragenames;
int hostArg;
int dbrootPerPM = 0;
//check if module type or module name was entered
if ( arguments[1].size() == 2 )
{
@ -5711,7 +5712,7 @@ int processCommand(string* arguments)
moduleType = arguments[1];
moduleCount = atoi(arguments[2].c_str());
hostArg = 4;
// MCOL-1607. Check whether we should store host names or IP addresses.
if (arguments[3] != "" && (arguments[3][0] == 'y' || arguments[3][0] == 'Y'))
storeHostnames = true;
@ -5746,7 +5747,7 @@ int processCommand(string* arguments)
// MCOL-1607. Check whether we should store host names or IP addresses.
if (arguments[2] != "" && (arguments[2][0] == 'y' || arguments[2][0] == 'Y'))
storeHostnames = true;
if (arguments[4] != "")
password = arguments[4];
else
@ -6024,7 +6025,7 @@ int processCommand(string* arguments)
// prompt for IP Address
string prompt = "IP Address of " + hostName + " not found, enter IP Address or enter 'abort'";
IPAddress = dataPrompt(prompt);
if ( IPAddress == "abort" || !oam.isValidIP(IPAddress) )
return 1;
}
@ -6065,7 +6066,7 @@ int processCommand(string* arguments)
DataRedundancyHostname = dataPrompt(prompt);
if (storeHostnames)
DataRedundancyIPAddress = DataRedundancyHostname;
else
else
{
DataRedundancyIPAddress = oam.getIPAddress(DataRedundancyHostname);
@ -6074,7 +6075,7 @@ int processCommand(string* arguments)
// prompt for IP Address
string prompt = "IP Address of " + DataRedundancyHostname + " not found, enter IP Address";
DataRedundancyIPAddress = dataPrompt(prompt);
if (!oam.isValidIP(DataRedundancyIPAddress))
return 1;
}
@ -7896,7 +7897,7 @@ int processCommand(string* arguments)
gracefulTemp = oam::FORCEFUL;
int returnStatus = oam.restartSystem(gracefulTemp, ackTemp);
switch (returnStatus)
{
{
case API_SUCCESS:
if ( waitForActive() )
cout << endl << " Successful restart of System " << endl << endl;
@ -10034,4 +10035,3 @@ bool SendToWES(Oam& oam, ByteStream bs)
return true;
}
// vim:ts=4 sw=4:

23
oamapps/postConfigure/installer.cpp
View File

@ -183,14 +183,14 @@ int main(int argc, char* argv[])
if (p && *p)
USER = p;
string tmpDir = startup::StartUp::tmpDir();
// setup to start on reboot, for non-root amazon installs
if ( !rootUser )
{
system("sed -i -e 's/#runuser/runuser/g' /etc/rc.d/rc.local >/dev/null 2>&1");
}
}
//copy Columnstore.xml.rpmsave if upgrade option is selected
if ( installType == "upgrade" )
@ -694,7 +694,7 @@ int main(int argc, char* argv[])
cmd = "chmod 755 -R /var/lib/columnstore/data1/systemFiles/dbrm > /dev/null 2>&1";
system(cmd.c_str());
}
string idbstartcmd = "columnstore start";
{
@ -711,6 +711,12 @@ int main(int argc, char* argv[])
mysqlSetup();
sleep(5);
if (getenv("SKIP_OAM_INIT"))
{
cout << "SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl;
exit(0);
}
//start on local module
int rtnCode = system(idbstartcmd.c_str());
@ -732,6 +738,12 @@ int main(int argc, char* argv[])
mysqlSetup();
sleep(5);
if (getenv("SKIP_OAM_INIT"))
{
cout << "SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl;
exit(0);
}
//startup mysqld and infinidb processes
cout << endl;
cmd = "clearShm > /dev/null 2>&1";
@ -778,7 +790,7 @@ int main(int argc, char* argv[])
exit (1);
}
}
cout << endl << "MariaDB ColumnStore Install Successfully Completed, System is Active" << endl << endl;
cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;
@ -990,7 +1002,7 @@ bool updateProcessConfig(int serverTypeInstall)
*/
bool makeRClocal(string moduleName, int IserverTypeInstall)
{
return true;
string moduleType = moduleName.substr(0, MAX_MODULE_TYPE_SIZE);
@ -1175,4 +1187,3 @@ bool uncommentCalpontXml( string entry)
}
// vim:ts=4 sw=4:

8
oamapps/postConfigure/postConfigure.cpp
View File

@ -3730,9 +3730,11 @@ int main(int argc, char* argv[])
// startup MariaDB ColumnStore
//
#ifdef SKIP_OAM_INIT
exit(0);
#endif
if (getenv("SKIP_OAM_INIT"))
{
cout << "SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl;
exit(0);
}
if ( IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM ||
pmNumber > 1 )