From 3d7f4a31703a0eaf22b18be5097bc8f6781f422c Mon Sep 17 00:00:00 2001
From: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date: Wed, 3 Oct 2018 13:04:54 -0500
Subject: [PATCH] Squash commit of fix-skip-oam-init branch.

Squashed commit of the following:

commit faaee9141af019363cbe207e4cdbe01e01493d0f
Author: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date:   Wed Oct 3 13:03:02 2018 -0500

    Commented a debugging printout.

commit e47e784c53705463696916f5c8dae1c014732f77
Author: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date:   Wed Oct 3 12:13:23 2018 -0500

    Moved the SKIP_OAM_INIT check for cleanliness, added 'config.h' to
    other places that need it.

commit 662604553538795f9a03e1167c7b44376349a56a
Author: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date:   Tue Oct 2 16:33:06 2018 -0500

    WIP.  First cut of excising OAM and root access from the dev process.

    This passes most tests; need to make sure that the tests that fail
    have nothing to do with this change.

    DMLProc is doing something that results in a sudo password prompt.
    Will obliterate that next.
---
 config.h.cmake                                         |  3 +++
 configureEngine.cmake                                  |  4 +++-
 exemgr/main.cpp                                        | 10 ++++++++++
 oam/oamcpp/liboamcpp.cpp                               |  1 +
 oam/oamcpp/oamcache.cpp                                |  2 ++
 .../redistribute/we_redistributecontrolthread.cpp      |  1 +
 writeengine/splitter/we_sdhandler.cpp                  |  1 +
 7 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/config.h.cmake b/config.h.cmake
index e320eb82c..74d707b11 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -2,6 +2,9 @@
 #ifndef TEST_CONFIG_H
 #define TEST_CONFIG_H
 
+/* Define to 1 to let the system come up without using OAM */
+#cmakedefine SKIP_OAM_INIT 1
+
 /* Define to 1 if you have the `alarm' function. */
 #cmakedefine HAVE_ALARM 1
 
diff --git a/configureEngine.cmake b/configureEngine.cmake
index 0a299c146..a3ac9d3c1 100644
--- a/configureEngine.cmake
+++ b/configureEngine.cmake
@@ -716,7 +716,9 @@ IF (NOT INLINE)
 SET (inline "")
 ENDIF()
 
-
+IF($ENV{SKIP_OAM_INIT})
+    SET(SKIP_OAM_INIT 1)
+ENDIF()
 
 EXECUTE_PROCESS(
     COMMAND rm -f conftest.data conftest.file conftest.sym
diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index 8742188a0..4e3b42347 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -63,6 +63,7 @@ using namespace std;
 #include <boost/scoped_ptr.hpp>
 using namespace boost;
 
+#include "config.h"
 #include "configcpp.h"
 using namespace config;
 #include "messagequeue.h"
@@ -100,6 +101,10 @@ using namespace querytele;
 #include "threadpool.h"
 #include "crashtrace.h"
 
+#if defined(SKIP_OAM_INIT)
+#include "dbrm.h"
+#endif
+
 namespace
 {
 
@@ -1601,6 +1606,11 @@ int main(int argc, char* argv[])
         {
         }
     }
+#if defined(SKIP_OAM_INIT)
+    BRM::DBRM *dbrm = new BRM::DBRM();
+    dbrm->setSystemQueryReady(true);
+    delete dbrm;
+#endif
 
     threadpool::ThreadPool exeMgrThreadPool(serverThreads, 0);
     exeMgrThreadPool.setName("ExeMgrServer");
diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index d53dd66de..bba892b0d 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -56,6 +56,7 @@
 #ifdef _MSC_VER
 #include "idbregistry.h"
 #endif
+#include "config.h"
 #include "installdir.h"
 #include "dbrm.h"
 #include "sessionmanager.h"
diff --git a/oam/oamcpp/oamcache.cpp b/oam/oamcpp/oamcache.cpp
index 084f88157..d8035bbf3 100644
--- a/oam/oamcpp/oamcache.cpp
+++ b/oam/oamcpp/oamcache.cpp
@@ -34,6 +34,7 @@ using namespace boost;
 #include "exceptclasses.h"
 #include "configcpp.h"
 #include "installdir.h"
+#include "config.h"
 
 namespace
 {
@@ -180,6 +181,7 @@ void OamCache::checkReload()
             }
         }
 #else
+        pmToConnectionMap[*it] = i++;
         moduleIds.push_back(*it);
 #endif
         it++;
diff --git a/writeengine/redistribute/we_redistributecontrolthread.cpp b/writeengine/redistribute/we_redistributecontrolthread.cpp
index ab2897834..70b5d1e2d 100644
--- a/writeengine/redistribute/we_redistributecontrolthread.cpp
+++ b/writeengine/redistribute/we_redistributecontrolthread.cpp
@@ -37,6 +37,7 @@ using namespace std;
 #include "boost/filesystem/operations.hpp"
 using namespace boost;
 
+#include "config.h"
 #include "installdir.h"
 
 #include "configcpp.h"
diff --git a/writeengine/splitter/we_sdhandler.cpp b/writeengine/splitter/we_sdhandler.cpp
index 61fe45239..647a90e89 100644
--- a/writeengine/splitter/we_sdhandler.cpp
+++ b/writeengine/splitter/we_sdhandler.cpp
@@ -43,6 +43,7 @@ using namespace std;
 #include <boost/thread.hpp>
 using namespace boost;
 
+#include "config.h"
 #include "configcpp.h"
 using namespace config;