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

changes for dbroot

Browse Source
This commit is contained in:
David Hill
2018-07-09 09:42:54 -05:00
parent 4f659108f0
commit 20c2cc87ad
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
oamapps/postConfigure/postConfigure.cpp
View File

@@ -493,13 +493,10 @@ int main(int argc, char *argv[])
} }
//check Config saved files //check Config saved files
if (!single_server_quick_install || !multi_server_quick_install) if ( !checkSaveConfigFile())
{ {
if ( !checkSaveConfigFile()) cout << "ERROR: Configuration File not setup" << endl;
{ exit(1);
cout << "ERROR: Configuration File not setup" << endl;
exit(1);
}
} }
//determine package type //determine package type
@@ -2471,28 +2468,35 @@ int main(int argc, char *argv[])
string dbrootList; string dbrootList;
for ( unsigned int id = 1 ; id < count+1 ; ) if (multi_server_quick_install)
{ {
string moduledbrootid = "ModuleDBRootID" + oam.itoa(moduleID) + "-" + oam.itoa(id) + "-" + oam.itoa(i+1); dbrootList = oam.itoa(moduleID);
try { }
string dbrootid = sysConfig->getConfig(ModuleSection, moduledbrootid); else
{
for ( unsigned int id = 1 ; id < count+1 ; )
{
string moduledbrootid = "ModuleDBRootID" + oam.itoa(moduleID) + "-" + oam.itoa(id) + "-" + oam.itoa(i+1);
try {
string dbrootid = sysConfig->getConfig(ModuleSection, moduledbrootid);
if ( dbrootid != oam::UnassignedName) { if ( dbrootid != oam::UnassignedName) {
sysConfig->setConfig(ModuleSection, moduledbrootid, oam::UnassignedName); sysConfig->setConfig(ModuleSection, moduledbrootid, oam::UnassignedName);
dbrootList = dbrootList + dbrootid; dbrootList = dbrootList + dbrootid;
id ++; id ++;
if ( id < count+1 ) if ( id < count+1 )
dbrootList = dbrootList + ","; dbrootList = dbrootList + ",";
}
}
catch(...)
{
cout << "ERROR: Problem setting DBRoot ID in the MariaDB ColumnStore System Configuration file" << endl;
exit(1);
} }
} }
catch(...)
{
cout << "ERROR: Problem setting DBRoot ID in the MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
} }
vector <string> dbroots; vector <string> dbroots;
string tempdbrootList; string tempdbrootList;
@@ -3581,6 +3585,15 @@ bool checkSaveConfigFile()
} }
return true; return true;
} }
else
{
if (single_server_quick_install || multi_server_quick_install)
{
cout << endl << "Quick Install is for fresh installs only, '" + oldFileName + "' exist, exiting" << endl;
exit(1);
}
}
File.close(); File.close();
// If 'oldFileName' isn't configured, exit // If 'oldFileName' isn't configured, exit