From 70b61444e2fbd73cbc04178398baa2b1a1b63a45 Mon Sep 17 00:00:00 2001 From: Ben Thompson Date: Fri, 11 Aug 2017 01:05:50 -0500 Subject: [PATCH] change GlusterConfig to DataRedundancyConfig in configuration file --- oam/etc/Columnstore.xml | 6 +-- oam/oamcpp/liboamcpp.cpp | 56 +++++++++++++-------------- oam/oamcpp/liboamcpp.h | 4 +- oamapps/mcsadmin/mcsadmin.cpp | 54 +++++++++++++------------- oamapps/serverMonitor/diskMonitor.cpp | 10 ++--- procmgr/main.cpp | 6 +-- procmgr/processmanager.cpp | 10 ++--- procmon/main.cpp | 12 +++--- procmon/processmonitor.cpp | 20 +++++----- tools/configMgt/autoConfigure.cpp | 20 +++++----- 10 files changed, 99 insertions(+), 99 deletions(-) diff --git a/oam/etc/Columnstore.xml b/oam/etc/Columnstore.xml index 262edc802..165951ddb 100644 --- a/oam/etc/Columnstore.xml +++ b/oam/etc/Columnstore.xml @@ -458,9 +458,9 @@ 0 unassigned unassigned - n - 0 - unassigned + n + 0 + unassigned n 3306 unassigned diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index 47a235527..59b965da7 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -5180,13 +5180,13 @@ namespace oam writeLog("manualMovePmDbroot: " + dbrootIDs + " from " + residePM + " to " + toPM, LOG_TYPE_DEBUG ); - string GlusterConfig = "n"; + string DataRedundancyConfig = "n"; try { - getSystemConfig( "GlusterConfig", GlusterConfig); + getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig); } catch(...) { - GlusterConfig = "n"; + DataRedundancyConfig = "n"; } boost::char_separator sep(", "); @@ -5196,7 +5196,7 @@ namespace oam ++it) { //if gluster, check if there are copies on the to-pm - if ( GlusterConfig == "y") + if ( DataRedundancyConfig == "y") { string pmList = ""; try { @@ -5358,7 +5358,7 @@ namespace oam } //if Gluster, do the assign command - if ( GlusterConfig == "y") + if ( DataRedundancyConfig == "y") { try { string errmsg; @@ -5454,16 +5454,16 @@ namespace oam } catch(...) {} - string GlusterConfig = "n"; + string DataRedundancyConfig = "n"; try { - getSystemConfig( "GlusterConfig", GlusterConfig); + getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig); } catch(...) { - GlusterConfig = "n"; + DataRedundancyConfig = "n"; } - if (DBRootStorageType == "internal" && GlusterConfig == "n") + if (DBRootStorageType == "internal" && DataRedundancyConfig == "n") return 1; // get current Module name @@ -5598,7 +5598,7 @@ namespace oam exceptionControl("autoMovePmDbroot", API_FAILURE); } - if ( GlusterConfig == "y") + if ( DataRedundancyConfig == "y") { try { string errmsg; @@ -5644,7 +5644,7 @@ namespace oam { //if Gluster, get it's list for DBroot and move to one of those string toPmID; - if ( GlusterConfig == "y") + if ( DataRedundancyConfig == "y") { string pmList = ""; try { @@ -5869,16 +5869,16 @@ namespace oam } catch(...) {} - string GlusterConfig = "n"; + string DataRedundancyConfig = "n"; try { - getSystemConfig( "GlusterConfig", GlusterConfig); + getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig); } catch(...) { - GlusterConfig = "n"; + DataRedundancyConfig = "n"; } - if (DBRootStorageType == "internal" && GlusterConfig == "n") + if (DBRootStorageType == "internal" && DataRedundancyConfig == "n") return 1; //store in move dbroot transaction file @@ -6457,13 +6457,13 @@ namespace oam cout << endl << "Changes being applied" << endl << endl; //added entered dbroot IDs to to-PM list and do Gluster assign if needed - string GlusterConfig = "n"; + string DataRedundancyConfig = "n"; try { - getSystemConfig( "GlusterConfig", GlusterConfig); + getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig); } catch(...) { - GlusterConfig = "n"; + DataRedundancyConfig = "n"; } DBRootConfigList::iterator pt3 = dbrootlist.begin(); @@ -6471,7 +6471,7 @@ namespace oam { todbrootConfigList.push_back(*pt3); -/* if ( GlusterConfig == "y") +/* if ( DataRedundancyConfig == "y") { try { string errmsg; @@ -6805,12 +6805,12 @@ namespace oam int SystemDBRootCount = 0; string cloud; string DBRootStorageType; - string GlusterConfig = "n"; + string DataRedundancyConfig = "n"; try { getSystemConfig("DBRootCount", SystemDBRootCount); getSystemConfig("Cloud", cloud); getSystemConfig("DBRootStorageType", DBRootStorageType); - getSystemConfig("GlusterConfig", GlusterConfig); + getSystemConfig("DataRedundancyConfig", DataRedundancyConfig); } catch(...) {} @@ -6896,7 +6896,7 @@ namespace oam } // if gluster, request volume delete - if ( GlusterConfig == "y") + if ( DataRedundancyConfig == "y") { try { string errmsg1; @@ -8261,7 +8261,7 @@ namespace oam int numberDBRootsPerPM = numberNewDBRoots/numberNewPMs; std::vector dbrootPms[dbrootCount]; - DataRedundancyConfig DataRedundancyConfigs[numberPMs]; + DataRedundancySetup DataRedundancyConfigs[numberPMs]; int startDBRootID = dbrootID; for (int pm=(pmID-1); pm < numberPMs; pm++,startDBRootID++) @@ -9582,18 +9582,18 @@ namespace oam } catch(...) {} - string GlusterConfig = "n"; + string DataRedundancyConfig = "n"; try { - getSystemConfig( "GlusterConfig", GlusterConfig); + getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig); } catch(...) { - GlusterConfig = "n"; + DataRedundancyConfig = "n"; } - if ( (DBRootStorageType == "external" && GlusterConfig == "n") + if ( (DBRootStorageType == "external" && DataRedundancyConfig == "n") || - (GlusterConfig == "y" && !mount) ) + (DataRedundancyConfig == "y" && !mount) ) { dbrootList::iterator pt3 = dbrootConfigList.begin(); for( ; pt3 != dbrootConfigList.end() ; pt3++) diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h index 7e708e45e..48bb9160a 100644 --- a/oam/oamcpp/liboamcpp.h +++ b/oam/oamcpp/liboamcpp.h @@ -1303,7 +1303,7 @@ namespace oam }; typedef std::vector DataRedundancyStorage; - struct DataRedundancyConfig_s + struct DataRedundancySetup_s { int pmID; std::string pmHostname; @@ -1311,7 +1311,7 @@ namespace oam std::vector dbrootCopies; DataRedundancyStorage storageLocations; }; - typedef struct DataRedundancyConfig_s DataRedundancyConfig; + typedef struct DataRedundancySetup_s DataRedundancySetup; // username / password for smbclient use const std::string USERNAME = "oamuser"; diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp index 745970c77..55d734afb 100644 --- a/oamapps/mcsadmin/mcsadmin.cpp +++ b/oamapps/mcsadmin/mcsadmin.cpp @@ -1876,17 +1876,17 @@ int processCommand(string* arguments) } } - string GlusterConfig; + string DataRedundancyConfig; string DataRedundancyCopies; string DataRedundancyStorageType; try { - oam.getSystemConfig("GlusterConfig", GlusterConfig); + oam.getSystemConfig("DataRedundancyConfig", DataRedundancyConfig); oam.getSystemConfig("DataRedundancyCopies", DataRedundancyCopies); oam.getSystemConfig("DataRedundancyStorageType", DataRedundancyStorageType); } catch(...) {} - if ( GlusterConfig == "y" ) + if ( DataRedundancyConfig == "y" ) { cout << endl << "Data Redundant Configuration" << endl << endl; cout << "Copies Per DBroot = " << DataRedundancyCopies << endl; @@ -1952,14 +1952,14 @@ int processCommand(string* arguments) case 14: // addDbroot parameters: dbroot-number { - string GlusterConfig = "n"; + string DataRedundancyConfig = "n"; try { - oam.getSystemConfig( "GlusterConfig", GlusterConfig); + oam.getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig); } catch(...) {} - if (GlusterConfig == "y") { + if (DataRedundancyConfig == "y") { cout << endl << "**** addDbroot Not Supported on Data Redundancy Configured System, use addModule command to expand your capacity" << endl; break; } @@ -2042,9 +2042,9 @@ int processCommand(string* arguments) case 15: // removeDbroot parameters: dbroot-list { - string GlusterConfig = "n"; + string DataRedundancyConfig = "n"; try { - oam.getSystemConfig( "GlusterConfig", GlusterConfig); + oam.getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig); } catch(...) {} @@ -3262,15 +3262,15 @@ int processCommand(string* arguments) } catch(...) {} - string GlusterConfig = "n"; + string DataRedundancyConfig = "n"; try { - oam.getSystemConfig( "GlusterConfig", GlusterConfig); + oam.getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig); } catch(...) {} - if (DBRootStorageType == "internal" && GlusterConfig == "n") + if (DBRootStorageType == "internal" && DataRedundancyConfig == "n") { cout << endl << "**** switchParentOAMModule Failed : DBRoot Storage type = internal/non-data-replication" << endl; break; @@ -3307,7 +3307,7 @@ int processCommand(string* arguments) } //check for gluster system is do-able - if (GlusterConfig == "y") + if (DataRedundancyConfig == "y") { // get to-module assigned DBRoots and see if current active PM // has a copy @@ -3574,17 +3574,17 @@ int processCommand(string* arguments) cout << endl << "**** getSystemStatus Failed = " << e.what() << endl; } - string GlusterConfig; + string DataRedundancyConfig; string DataRedundancyCopies; string DataRedundancyStorageType; try { - oam.getSystemConfig("GlusterConfig", GlusterConfig); + oam.getSystemConfig("DataRedundancyConfig", DataRedundancyConfig); oam.getSystemConfig("DataRedundancyCopies", DataRedundancyCopies); oam.getSystemConfig("DataRedundancyStorageType", DataRedundancyStorageType); } catch(...) {} - if ( GlusterConfig == "y" ) + if ( DataRedundancyConfig == "y" ) { string arg1 = ""; string arg2 = ""; @@ -3754,13 +3754,13 @@ int processCommand(string* arguments) } //if gluster, check if toPM is has a copy - string GlusterConfig; + string DataRedundancyConfig; try { - oam.getSystemConfig("GlusterConfig", GlusterConfig); + oam.getSystemConfig("DataRedundancyConfig", DataRedundancyConfig); } catch(...) {} - if ( GlusterConfig == "y" ) + if ( DataRedundancyConfig == "y" ) { string pmList = ""; try { @@ -4224,16 +4224,16 @@ int processCommand(string* arguments) oam.getSystemConfig("DBRootStorageType", DBRootStorageType); if (DBRootStorageType == "external" ){ - string GlusterConfig = "n"; + string DataRedundancyConfig = "n"; string cloud = oam::UnassignedName; try { oam.getSystemConfig("Cloud", cloud); - oam.getSystemConfig( "GlusterConfig", GlusterConfig); + oam.getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig); } catch(...) {} - if ( GlusterConfig == "n" && cloud == oam::UnassignedName) + if ( DataRedundancyConfig == "n" && cloud == oam::UnassignedName) cout << " REMINDER: Update the /etc/fstab on " << toPM << " to include these dbroot mounts" << endl << endl; break; @@ -5103,7 +5103,7 @@ int processCommand(string* arguments) } } - string GlusterConfig = "n"; + string DataRedundancyConfig = "n"; int DataRedundancyCopies; string cloud = oam::UnassignedName; int DataRedundancyNetworkType; @@ -5113,7 +5113,7 @@ int processCommand(string* arguments) try { oam.getSystemConfig("Cloud", cloud); oam.getSystemConfig("AmazonVPCNextPrivateIP", AmazonVPCNextPrivateIP); - oam.getSystemConfig("GlusterConfig", GlusterConfig); + oam.getSystemConfig("DataRedundancyConfig", DataRedundancyConfig); oam.getSystemConfig("DataRedundancyCopies", DataRedundancyCopies); oam.getSystemConfig("DataRedundancyNetworkType", DataRedundancyNetworkType); oam.getSystemConfig("DataRedundancyStorageType", DataRedundancyStorageType); @@ -5206,7 +5206,7 @@ int processCommand(string* arguments) break; } - if ( GlusterConfig == "y" && moduleType == "pm" ) { + if ( DataRedundancyConfig == "y" && moduleType == "pm" ) { if ( localModule != parentOAMModule ) { // exit out since not on active module cout << endl << "**** addModule Failed : Can only run command on Active OAM Parent Module (" << parentOAMModule << ")." << endl; @@ -5435,7 +5435,7 @@ int processCommand(string* arguments) devicenetworkconfig.hostConfigList.clear(); moduleName.clear(); - if ( GlusterConfig == "y" && DataRedundancyNetworkType == 2 && moduleType == "pm") + if ( DataRedundancyConfig == "y" && DataRedundancyNetworkType == 2 && moduleType == "pm") { string DataRedundancyIPAddress = sysConfig->getConfig("DataRedundancyConfig",dataDupIPaddr); string DataRedundancyHostname = sysConfig->getConfig("DataRedundancyConfig",dataDupHostName); @@ -5463,7 +5463,7 @@ int processCommand(string* arguments) storageDeviceList storagedevicelist; string deviceType; - if ( GlusterConfig == "y" && moduleType == "pm") + if ( DataRedundancyConfig == "y" && moduleType == "pm") { cout << endl << "System is configured with Data Redundancy, DBRoot Storage will" << endl; cout << "will be created with the Modules during this command." << endl; @@ -5528,7 +5528,7 @@ int processCommand(string* arguments) cout << "Add Module(s) successfully completed" << endl; - if ( GlusterConfig == "y" && moduleType == "pm" ) { + if ( DataRedundancyConfig == "y" && moduleType == "pm" ) { { //send messages to update fstab to new modules, if needed diff --git a/oamapps/serverMonitor/diskMonitor.cpp b/oamapps/serverMonitor/diskMonitor.cpp index 4a043db0c..c1ca0c834 100644 --- a/oamapps/serverMonitor/diskMonitor.cpp +++ b/oamapps/serverMonitor/diskMonitor.cpp @@ -93,13 +93,13 @@ void diskMonitor() } //get Gluster Config setting - string GlusterConfig = "n"; + string DataRedundancyConfig = "n"; try { - oam.getSystemConfig( "GlusterConfig", GlusterConfig); + oam.getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig); } catch(...) { - GlusterConfig = "n"; + DataRedundancyConfig = "n"; } int diskSpaceCheck = 0; @@ -323,7 +323,7 @@ void diskMonitor() //check for external file systems/devices if (Externalflag || - (!Externalflag && GlusterConfig == "y" && moduleType == "pm") ){ + (!Externalflag && DataRedundancyConfig == "y" && moduleType == "pm") ){ try { DBRootConfigList dbrootConfigList; @@ -566,7 +566,7 @@ void diskMonitor() } //do Gluster status check, if configured - if ( GlusterConfig == "y") + if ( DataRedundancyConfig == "y") { bool pass = true; string errmsg = "unknown"; diff --git a/procmgr/main.cpp b/procmgr/main.cpp index 228980f43..11edf64f3 100644 --- a/procmgr/main.cpp +++ b/procmgr/main.cpp @@ -51,7 +51,7 @@ bool amazon = false; string PMInstanceType; string UMInstanceType; string AmazonPMFailover = "y"; -string GlusterConfig = "n"; +string DataRedundancyConfig = "n"; bool rootUser = true; string USER = "root"; bool HDFS = false; @@ -153,11 +153,11 @@ int main(int argc, char **argv) //get gluster config try { - oam.getSystemConfig( "GlusterConfig", GlusterConfig); + oam.getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig); } catch(...) { - GlusterConfig = "n"; + DataRedundancyConfig = "n"; } //hdfs / hadoop config diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp index dddc7adb8..7599692c2 100644 --- a/procmgr/processmanager.cpp +++ b/procmgr/processmanager.cpp @@ -48,7 +48,7 @@ extern bool runStandby; extern string iface_name; extern string PMInstanceType; extern string UMInstanceType; -extern string GlusterConfig; +extern string DataRedundancyConfig; extern bool rootUser; extern string USER; extern bool HDFS; @@ -8539,7 +8539,7 @@ int ProcessManager::switchParentOAMModule(std::string newActiveModuleName) log.writeLog(__LINE__, "switchParentOAMModule Function Started", LOG_TYPE_DEBUG); - if ( DBRootStorageType == "internal" && GlusterConfig == "n") { + if ( DBRootStorageType == "internal" && DataRedundancyConfig == "n") { log.writeLog(__LINE__, "ERROR: DBRootStorageType = internal", LOG_TYPE_ERROR); pthread_mutex_unlock(&THREAD_LOCK); return API_INVALID_PARAMETER; @@ -9138,7 +9138,7 @@ int ProcessManager::OAMParentModuleChange() } - if ( DBRootStorageType == "internal" && failover && GlusterConfig == "n") + if ( DBRootStorageType == "internal" && failover && DataRedundancyConfig == "n") { log.writeLog(__LINE__, "DBRoot Storage configured for internal, don't do standby-active failover", LOG_TYPE_DEBUG); @@ -9537,7 +9537,7 @@ std::string ProcessManager::getStandbyModule() //check if gluster, if so then find PMs that have copies of DBROOT #1 string pmList = ""; - if (GlusterConfig == "y") { + if (DataRedundancyConfig == "y") { try { string errmsg; @@ -10024,7 +10024,7 @@ int ProcessManager::mountDBRoot(std::string dbrootID) ProcessManager processManager(config, log); Oam oam; - if (GlusterConfig == "y") + if (DataRedundancyConfig == "y") return oam::API_SUCCESS; //get pm assigned to that dbroot diff --git a/procmon/main.cpp b/procmon/main.cpp index e9c0bd50f..435d6fc8f 100644 --- a/procmon/main.cpp +++ b/procmon/main.cpp @@ -47,7 +47,7 @@ static void mysqlMonitorThread(MonitorConfig config); string systemOAM; string dm_server; string cloud; -string GlusterConfig = "n"; +string DataRedundancyConfig = "n"; bool HDFS = false; void updateShareMemory(processStatusList* aPtr); @@ -207,14 +207,14 @@ int main(int argc, char **argv) //get gluster config try { - oam.getSystemConfig( "GlusterConfig", GlusterConfig); + oam.getSystemConfig( "DataRedundancyConfig", DataRedundancyConfig); } catch(...) { - GlusterConfig = "n"; + DataRedundancyConfig = "n"; } - if ( GlusterConfig == "y" ) { + if ( DataRedundancyConfig == "y" ) { system("mount -a > /dev/null 2>&1"); } @@ -524,7 +524,7 @@ int main(int argc, char **argv) //check if gluster, if so then find PMs that have copies of DBROOT #1 string pmList = ""; - if (GlusterConfig == "y") { + if (DataRedundancyConfig == "y") { try { string errmsg; @@ -2021,7 +2021,7 @@ static void statusControlThread() std::vectordbrootList; if ( DBRootStorageType == "external" || - GlusterConfig == "y") { + DataRedundancyConfig == "y") { //get system dbroots DBRootConfigList dbrootConfigList; try diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp index f735923ef..e5bfd7ddc 100644 --- a/procmon/processmonitor.cpp +++ b/procmon/processmonitor.cpp @@ -46,7 +46,7 @@ extern bool runStandby; extern bool processInitComplete; extern int fmoduleNumber; extern string cloud; -extern string GlusterConfig; +extern string DataRedundancyConfig; extern bool rootUser; extern string USER; extern bool HDFS; @@ -1615,7 +1615,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO flushInodeCache(); int return_status = API_SUCCESS; - if (GlusterConfig == "n") + if (DataRedundancyConfig == "n") { int retry = 1; for ( ; retry < 5 ; retry++) @@ -1689,7 +1689,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO log.writeLog(__LINE__, "MSG RECEIVED: Mount DBRoot: " + dbrootID);; int return_status = API_SUCCESS; - if (GlusterConfig == "n") + if (DataRedundancyConfig == "n") { string cmd = "export LC_ALL=C;mount " + startup::StartUp::installDir() + "/data" + dbrootID + " > /tmp/mount.txt 2>&1"; system(cmd.c_str()); @@ -2461,7 +2461,7 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName, } // now delete the dbrm data from local disk - if ( !gOAMParentModuleFlag && !HDFS && GlusterConfig == "n") { + if ( !gOAMParentModuleFlag && !HDFS && DataRedundancyConfig == "n") { string cmd = "rm -f " + DBRMDir + "/*"; system(cmd.c_str()); log.writeLog(__LINE__, "removed DBRM file with command: " + cmd, LOG_TYPE_DEBUG); @@ -5719,12 +5719,12 @@ void ProcessMonitor::unmountExtraDBroots() oam.getSystemConfig("DBRootStorageType", DBRootStorageType); if ( DBRootStorageType == "hdfs" || - ( DBRootStorageType == "internal" && GlusterConfig == "n") ) + ( DBRootStorageType == "internal" && DataRedundancyConfig == "n") ) return; } catch(...) {} -// if (GlusterConfig == "y") +// if (DataRedundancyConfig == "y") // return; try @@ -5755,7 +5755,7 @@ void ProcessMonitor::unmountExtraDBroots() if (config.moduleID() != moduleID) { - if ( GlusterConfig == "n" ) + if ( DataRedundancyConfig == "n" ) { string cmd = "umount " + startup::StartUp::installDir() + "/data" + oam.itoa(id) + " > /dev/null 2>&1"; system(cmd.c_str()); @@ -5863,7 +5863,7 @@ int ProcessMonitor::checkDataMount() catch(...) {} //asign DBRoot is gluster - if (GlusterConfig == "y") + if (DataRedundancyConfig == "y") { vector::iterator p = dbrootList.begin(); while ( p != dbrootList.end() ) @@ -5886,7 +5886,7 @@ int ProcessMonitor::checkDataMount() } if ( DBRootStorageType == "hdfs" || - (DBRootStorageType == "internal" && GlusterConfig == "n") ) { + (DBRootStorageType == "internal" && DataRedundancyConfig == "n") ) { //create OAM-Test-Flag vector::iterator p = dbrootList.begin(); while ( p != dbrootList.end() ) @@ -5921,7 +5921,7 @@ int ProcessMonitor::checkDataMount() string dbroot = installDir + "/data" + *p; string fileName = dbroot + "/OAMdbrootCheck"; - if ( GlusterConfig == "n" ) { + if ( DataRedundancyConfig == "n" ) { //remove any local check flag for starters string cmd = "umount " + dbroot + " > /tmp/umount.txt 2>&1"; system(cmd.c_str()); diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp index 031f04544..c39939fdf 100644 --- a/tools/configMgt/autoConfigure.cpp +++ b/tools/configMgt/autoConfigure.cpp @@ -201,21 +201,21 @@ int main(int argc, char *argv[]) } //set gluster flag if it exists - string GlusterConfig; - string GlusterCopies; - string GlusterStorageType; + string DataRedundancyConfig; + string DataRedundancyCopies; + string DataRedundancyStorageType; try { - GlusterConfig = sysConfigOld->getConfig(InstallSection, "GlusterConfig"); - GlusterCopies = sysConfigOld->getConfig(InstallSection, "GlusterCopies"); - GlusterStorageType = sysConfigOld->getConfig(InstallSection, "GlusterStorageType"); + DataRedundancyConfig = sysConfigOld->getConfig(InstallSection, "DataRedundancyConfig"); + DataRedundancyCopies = sysConfigOld->getConfig(InstallSection, "DataRedundancyCopies"); + DataRedundancyStorageType = sysConfigOld->getConfig(InstallSection, "DataRedundancyStorageType"); } catch(...) {} - if ( !GlusterConfig.empty() ) { + if ( !DataRedundancyConfig.empty() ) { try { - sysConfigNew->setConfig(InstallSection, "GlusterConfig", GlusterConfig); - sysConfigNew->setConfig(InstallSection, "GlusterCopies", GlusterCopies); - sysConfigNew->setConfig(InstallSection, "GlusterStorageType", GlusterStorageType); + sysConfigNew->setConfig(InstallSection, "DataRedundancyConfig", DataRedundancyConfig); + sysConfigNew->setConfig(InstallSection, "DataRedundancyCopies", DataRedundancyCopies); + sysConfigNew->setConfig(InstallSection, "DataRedundancyStorageType", DataRedundancyStorageType); } catch(...) {}