From 753139a933f758c0439e0f4e92989795f764f124 Mon Sep 17 00:00:00 2001 From: Patrick LeBlanc Date: Wed, 12 Jun 2019 13:07:22 -0500 Subject: [PATCH] Checked for references to DBRootStorageType, made a couple changes I suspect are necessary to make failover work. --- oam/oamcpp/liboamcpp.cpp | 4 ++++ procmgr/main.cpp | 1 + procmon/processmonitor.cpp | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index 5a6273b5d..f0429b588 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -10769,6 +10769,10 @@ void Oam::mountDBRoot(dbrootList dbrootConfigList, bool mount) } catch (...) {} + // nothing to do here + if (DBRootStorageType == "storagemanager") + return; + string DataRedundancyConfig = "n"; try diff --git a/procmgr/main.cpp b/procmgr/main.cpp index 35f544a75..fda8b097c 100644 --- a/procmgr/main.cpp +++ b/procmgr/main.cpp @@ -1898,6 +1898,7 @@ void pingDeviceThread() { DBRootConfigList::iterator pt = dbrootConfigList.begin(); + // StorageManager: Need to do this for storagemanager as well? What's it doing? if (( DBRootStorageType == "DataRedundancy") && (*pt == 1)) { log.writeLog(__LINE__, "stopModule, " + config.moduleName(), LOG_TYPE_DEBUG); diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp index a90f1fdf8..32316888d 100644 --- a/procmon/processmonitor.cpp +++ b/procmon/processmonitor.cpp @@ -6100,7 +6100,7 @@ void ProcessMonitor::unmountExtraDBroots() { oam.getSystemConfig("DBRootStorageType", DBRootStorageType); - if ( DBRootStorageType == "hdfs" || + if ( DBRootStorageType == "hdfs" || DBRootStorageType == "storagemanager" || ( DBRootStorageType == "internal" && DataRedundancyConfig == "n") ) return; }