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

mcol-943

Browse Source
This commit is contained in:
david hill
2017-10-19 15:48:39 -05:00
parent 9f8c57e2de
commit 5c34be958b
17 changed files with 155 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
procmon/processmonitor.cpp
View File

@@ -4673,10 +4673,10 @@ int ProcessMonitor::changeMyCnf(std::string type)
buf = "server-id = 1";
}
pos = buf.find("# binlog_format=ROW",0);
if ( pos != string::npos ) {
buf = "binlog_format=ROW";
}
// pos = buf.find("# binlog_format=ROW",0);
// if ( pos != string::npos ) {
// buf = "binlog_format=ROW";
// }
pos = buf.find("infinidb_local_query=1",0);
if ( pos != string::npos && pos == 0) {
@@ -4755,22 +4755,7 @@ int ProcessMonitor::changeMyCnf(std::string type)
return oam::API_FAILURE;
}
// get local host name
/* string HOSTNAME = "localhost";
try
{
ModuleConfig moduleconfig;
oam.getSystemConfig(config.moduleName(), moduleconfig);
HostConfigList::iterator pt1 = moduleconfig.hostConfigList.begin();
HOSTNAME = (*pt1).HostName;
}
catch(...)
{}
char* p= getenv("HOSTNAME");
if (p && *p)
HOSTNAME = p;
*/
// set slave replication entries
vector <string> lines;
char line[200];
@@ -4799,10 +4784,10 @@ int ProcessMonitor::changeMyCnf(std::string type)
}
}
pos = buf.find("binlog_format=ROW",0);
if ( pos != string::npos && pos == 0 ) {
buf = "# binlog_format=ROW";
}
// pos = buf.find("binlog_format=ROW",0);
// if ( pos != string::npos && pos == 0 ) {
// buf = "# binlog_format=ROW";
// }
//output to temp file
lines.push_back(buf);
@@ -4821,7 +4806,7 @@ int ProcessMonitor::changeMyCnf(std::string type)
close(fd);
}
if ( type == "disable" )
/* if ( type == "disable" )
{
// set master replication entries
vector <string> lines;
@@ -4886,7 +4871,7 @@ int ProcessMonitor::changeMyCnf(std::string type)
close(fd);
}
*/
// set owner and permission
string cmd = "chmod 664 " + mycnfFile + " >/dev/null 2>&1";
if ( !rootUser)
@@ -4964,6 +4949,11 @@ int ProcessMonitor::runMasterRep(std::string& masterLogFile, std::string& master
bool passwordError = false;
string moduleType = systemModuleTypeConfig.moduletypeconfig[i].ModuleType;
if ( (PMwithUM == "n") && (moduleType == "pm") && ( config.ServerInstallType() != oam::INSTALL_COMBINE_DM_UM_PM) )
continue;
HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
while(true) // need in case there is a password retry
{
@@ -5004,7 +4994,7 @@ int ProcessMonitor::runMasterRep(std::string& masterLogFile, std::string& master
if ( passwordError )
{
try {
mysqlpw = oam.getMySQLPassword(true);
mysqlpw = oam.getMySQLPassword();
}
catch (...)
{}
@@ -5154,7 +5144,7 @@ int ProcessMonitor::runSlaveRep(std::string& masterLogFile, std::string& masterL
if ( passwordError )
{
try {
mysqlpw = oam.getMySQLPassword(true);
mysqlpw = oam.getMySQLPassword();
}
catch (...)
{}