database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-03 17:13:17 +03:00
Code Activity

MCOL-481 fix

Browse Source
This commit is contained in:
david hill
2017-01-19 15:16:17 -06:00
parent 568e9b0168
commit 8f2bfb58de
2 changed files with 21 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
oamapps/postConfigure/postConfigure.cpp
View File

@@ -703,8 +703,6 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
if ( mysqlRep )
{ // current enabled
if ( answer == "y" ) { if ( answer == "y" ) {
mysqlRep = true; mysqlRep = true;
MySQLRep = "y"; MySQLRep = "y";
@@ -714,19 +712,6 @@ int main(int argc, char *argv[])
mysqlRep = false; mysqlRep = false;
MySQLRep = "n"; MySQLRep = "n";
} }
}
else
{ // currently disabled
if ( answer == "y" ) {
mysqlRep = false;
MySQLRep = "n";
}
else
{
mysqlRep = true;
MySQLRep = "y";
}
}
try { try {
sysConfig->setConfig(InstallSection, "MySQLRep", MySQLRep); sysConfig->setConfig(InstallSection, "MySQLRep", MySQLRep);
@@ -734,6 +719,10 @@ int main(int argc, char *argv[])
catch(...) catch(...)
{} {}
if ( !writeConfig(sysConfig) ) {
cout << "ERROR: Failed trying to update MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
switch ( IserverTypeInstall ) { switch ( IserverTypeInstall ) {
case (oam::INSTALL_COMBINE_DM_UM_PM): // combined #1 - dm/um/pm on a single server case (oam::INSTALL_COMBINE_DM_UM_PM): // combined #1 - dm/um/pm on a single server

22
procmgr/processmanager.cpp
View File

@@ -10054,15 +10054,7 @@ int ProcessManager::setMySQLReplication(oam::DeviceNetworkList devicenetworklist
try { try {
Config* sysConfig = Config::makeConfig(); Config* sysConfig = Config::makeConfig();
if ( sysConfig->getConfig("DBRM_Controller", "NumWorkers") == "1" ) { if ( sysConfig->getConfig("DBRM_Controller", "NumWorkers") == "1" ) {
//disable mysqlrep return oam::API_SUCCESS;
log.writeLog(__LINE__, "Disable MySQL Replication", LOG_TYPE_DEBUG);
try {
oam.setSystemConfig("MySQLRep", "n");
}
catch(...) {}
enable = false;
distributeDB = true;
} }
} }
catch(...) catch(...)
@@ -10080,17 +10072,9 @@ int ProcessManager::setMySQLReplication(oam::DeviceNetworkList devicenetworklist
catch(...) catch(...)
{} {}
if ( moduletypeconfig.ModuleCount < 1 ) if ( moduletypeconfig.ModuleCount < 2 )
{ {
//disable mysqlrep return oam::API_SUCCESS;
log.writeLog(__LINE__, "Disable MySQL Replication", LOG_TYPE_DEBUG);
try {
oam.setSystemConfig("MySQLRep", "n");
}
catch(...) {}
enable = false;
distributeDB = true;
} }
} }