database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge branch 'develop' into MCOL-3536

Browse Source
This commit is contained in:
David Hall
2020-05-28 14:20:32 -05:00
parent 2e66b1f1e8 b1a2adbab7
commit a43de9d536
28 changed files with 300 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oamapps/mcsadmin/mcsadmin.cpp
View File

@ -174,10 +174,8 @@ void setupSignalHandlers()
int main(int argc, char* argv[])
{
// print a warning if this is a developer build
if (getenv("SKIP_OAM_INIT"))
{
cout << "SKIP_OAM_INIT is set" << endl;
cout << "SKIP_OAM_INIT is set and legacy OAM is disabled by default" << endl;
sleep(2);
}

12
oamapps/postConfigure/helpers.cpp
View File

@ -250,14 +250,12 @@ void mysqlSetup()
{
Oam oam;
string cmd;
string tmpDir = startup::StartUp::tmpDir();
string tmpDir = startup::StartUp::tmpDir();
string mysqlpw = oam.getMySQLPassword();
string passwordOption = "";
if ( mysqlpw != oam::UnassignedName )
passwordOption = " --password=" + mysqlpw;
string passwordOption = "";
if ( mysqlpw != oam::UnassignedName )
passwordOption = " --password=" + mysqlpw;
cmd = "post-mysqld-install " + passwordOption + " --tmpdir=" + tmpDir + " > " + tmpDir + "/post-mysqld-install.log 2>&1";
int rtnCode = system(cmd.c_str());

11
oamapps/postConfigure/postConfigure.cpp
View File

@ -89,13 +89,8 @@ int main(int argc, char* argv[])
string cmd;
string numBlocksPctParam = "";
string totalUmMemoryParam = "";
string reuseConfig = "n";
string mysqlPort = "";
string homeDir = "/root";
bool rootUser = true;
Config* sysConfig = Config::makeConfig();
mysqlPort = sysConfig->getConfig("Installation", "MySQLPort");
//check if root-user
int user;
@ -122,15 +117,11 @@ int main(int argc, char* argv[])
char timestamp[200];
strftime (timestamp, 200, "%m:%d:%y-%H:%M:%S", &tm);
string currentDate = timestamp;
string postConfigureLog = "/var/log/columnstore-postconfigure-" + currentDate;
// perform single server install
cout << endl << "Performing the Single Server Install." << endl << endl;
//setup to Columnstore.xml file for single server
//singleServerConfigSetup(sysConfig);
if (!rootUser)
{
if (!updateBash(homeDir))
@ -147,7 +138,7 @@ int main(int argc, char* argv[])
totalUmMemoryParam = "-";
}
cmd = "columnstore_installer dummy.rpm dummy.rpm dummy.rpm dummy.rpm dummy.rpm initial dummy " + reuseConfig + " --nodeps ' ' 1 " + numBlocksPctParam + " " + totalUmMemoryParam;
cmd = "columnstore_installer dummy.rpm dummy.rpm dummy.rpm dummy.rpm dummy.rpm initial dummy n --nodeps ' ' 1 " + numBlocksPctParam + " " + totalUmMemoryParam;
system(cmd.c_str());
exit(0);
}