From b72a9784ba3ec6b8b5d9367bd948dc682ecc8bf1 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Tue, 28 Jan 2020 15:24:27 +0000
Subject: [PATCH] Merge pull request #1014 from tntnatbry/MCOL-3675

MCOL-3675 and MCOL-3676 Detect in postConfigure if columnstore-post-install is run or not
---
 oamapps/postConfigure/postConfigure.cpp | 34 +++++++++++++++++++------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index 1ec9b023e..5f30a37eb 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -58,6 +58,7 @@
 
 #include <string.h> /* for strncpy */
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <netinet/in.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 << 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 (!noPrompting) {
@@ -3790,14 +3816,6 @@ int main(int argc, char* argv[])
     cout << endl << "MariaDB ColumnStore Database Platform Starting, please wait .";
     cout.flush();
 
-    string ProfileFile;
-	try
-	{
-		ProfileFile = sysConfig->getConfig(InstallSection, "ProfileFile");
-	}
-	catch (...)
-	{}
-
     if ( waitForActive() )
     {
         cout << " DONE" << endl;