database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge pull request #1014 from tntnatbry/MCOL-3675

Browse Source 
MCOL-3675 and MCOL-3676 Detect in postConfigure if columnstore-post-install is run or not
This commit is contained in:
Andrew Hutchings
2020-01-28 15:24:27 +00:00
committed by Patrick LeBlanc
parent ea3ced83af
commit b72a9784ba
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
oamapps/postConfigure/postConfigure.cpp
View File

@ -58,6 +58,7 @@
#include <string.h> /* for strncpy */ #include <string.h> /* for strncpy */
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <net/if.h> #include <net/if.h>
@ -498,6 +499,31 @@ int main(int argc, char* argv[])
cout << "IMPORTANT: This tool requires to run on the Performance Module #1" << endl; cout << "IMPORTANT: This tool requires to run on the Performance Module #1" << endl;
cout << endl; cout << endl;
// MCOL-3675
struct stat dir_info;
if (stat(tmpDir.c_str(), &dir_info) != 0)
{
cerr<<endl<<tmpDir<<" directory not found."<<endl;
cerr<<"Make sure columnstore-post-install is run before you run this tool. Exiting."<<endl<<endl;
exit(1);
}
string ProfileFile;
try
{
ProfileFile = sysConfig->getConfig(InstallSection, "ProfileFile");
}
catch (...)
{}
// MCOL-3676
if (ProfileFile.empty())
{
cerr<<endl<<"ProfileFile variable not set in the Config file."<<endl;
cerr<<"Make sure columnstore-post-install is run before you run this tool. Exiting."<<endl<<endl;
exit(1);
}
if (!single_server_quick_install || !multi_server_quick_install || !amazon_quick_install) if (!single_server_quick_install || !multi_server_quick_install || !amazon_quick_install)
{ {
if (!noPrompting) { if (!noPrompting) {
@ -3790,14 +3816,6 @@ int main(int argc, char* argv[])
cout << endl << "MariaDB ColumnStore Database Platform Starting, please wait ."; cout << endl << "MariaDB ColumnStore Database Platform Starting, please wait .";
cout.flush(); cout.flush();
string ProfileFile;
try
{
ProfileFile = sysConfig->getConfig(InstallSection, "ProfileFile");
}
catch (...)
{}
if ( waitForActive() ) if ( waitForActive() )
{ {
cout << " DONE" << endl; cout << " DONE" << endl;