database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Cleaned up the diff vs S3-project.

Browse Source
This commit is contained in:
Patrick LeBlanc
2019-06-12 10:00:11 -05:00
parent 4ae09352d2
commit 366cd406ba
8 changed files with 11 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oam/etc/ProcessConfig.xml
View File

@ -21,8 +21,6 @@
<RunType>ACTIVE_STANDBY</RunType>
<LogFile>off</LogFile>
</PROCESSCONFIG2>
<PROCESSCONFIG3>
<ProcessName>StorageManager</ProcessName>
<ModuleType>ChildExtOAMModule</ModuleType>
@ -34,8 +32,6 @@
<RunType>LOADSHARE</RunType>
<LogFile>off</LogFile>
</PROCESSCONFIG3>
<PROCESSCONFIG4>
<ProcessName>DBRMControllerNode</ProcessName>
<ModuleType>ParentOAMModule</ModuleType>

1
oam/oamcpp/liboamcpp.cpp
View File

@ -1991,6 +1991,7 @@ void Oam::getProcessConfig(SystemProcessConfig& systemprocessconfig)
proConfig->getConfig(sectionName, "ModuleType"),
processconfig );
// hide StorageManager from everything else if it is disabled
if (processconfig.ProcessName.empty() ||
(!storageManagerEnabled && processconfig.ProcessName == "StorageManager"))
continue;

6
oamapps/postConfigure/postConfigure.cpp
View File

@ -936,8 +936,6 @@ int main(int argc, char* argv[])
}
}
// perform single server install
if (singleServerInstall == "1")
{
@ -5053,7 +5051,7 @@ bool storageSetup(bool amazonInstall)
cout << "----- Setup User Module MariaDB ColumnStore Data Storage Mount Configuration -----" << endl << endl;
cout << "There are 2 options when configuring the storage: internal, and external" << endl << endl;
cout << "There are 2 options when configuring the storage: internal and external" << endl << endl;
cout << " 'internal' - This is specified when a local disk is used for the Data storage." << endl << endl;
cout << " 'external' - This is specified when the MariaDB ColumnStore Data directory is externally mounted." << endl << endl;
@ -5084,7 +5082,7 @@ bool storageSetup(bool amazonInstall)
callFree(pcommand);
}
if ( storageType == "1" || storageType == "2" )
if ( storageType == "1" || storageType == "2")
break;
cout << endl << "Invalid Entry, please re-enter" << endl << endl;

2
oamapps/serverMonitor/main.cpp
View File

@ -313,7 +313,7 @@ int main (int argc, char** argv)
pthread_t cpuMonitorThread;
pthread_create (&cpuMonitorThread, NULL, (void* (*)(void*)) &cpuMonitor, NULL);
//Launch Disk Monitor Thread
//Launch Disk Monitor Thread if it's not a storagemanager cluster
config::Config *_config = config::Config::makeConfig();
string storageType = _config->getConfig("Installation", "DBRootStorageType");
if (storageType != "storagemanager")

2
procmgr/processmanager.cpp
View File

@ -9169,7 +9169,6 @@ int ProcessManager::getDBRMData(messageqcpp::IOSocket fIos, std::string moduleNa
string oidFile;
oam.getSystemConfig("OIDBitmapFile", oidFile);
// StorageManager: Need to make these existence checks use an idbfilesystem op if we
// decide to put the BRM-managed files in cloud storage
string currentDbrmFile;
@ -9293,7 +9292,6 @@ int ProcessManager::getDBRMData(messageqcpp::IOSocket fIos, std::string moduleNa
}
// put oid file and current file in list
// StorageManager: no need to distribute these files if in cloud storage
dbrmFiles.push_back(currentFileName);
ifstream file1 (journalFileName.c_str());

9
procmon/main.cpp
View File

@ -1018,11 +1018,8 @@ int main(int argc, char** argv)
// StorageManager doesn't send the "I'm online" msg to Proc*.
// Just mark it active for now. TODO: make it use the ping fcn in IDB* instead.
if (listPtr->ProcessName == "StorageManager")
{
log.writeLog(__LINE__, "StorageManager WTF? 1", LOG_TYPE_DEBUG);
oam.setProcessStatus("StorageManager", boost::get<0>(oam.getModuleInfo()),
oam::ACTIVE, listPtr->processID);
}
string restartStatus;
@ -1078,11 +1075,8 @@ int main(int argc, char** argv)
// StorageManager doesn't send the "I'm online" msg to Proc*.
// Just mark it active for now. TODO: make it use the ping fcn in IDB* instead.
if (listPtr->ProcessName == "StorageManager")
{
log.writeLog(__LINE__, "StorageManager WTF? 2", LOG_TYPE_DEBUG);
oam.setProcessStatus("StorageManager", boost::get<0>(oam.getModuleInfo()),
oam::ACTIVE, listPtr->processID);
}
string restartStatus;
@ -1674,11 +1668,8 @@ static void chldHandleThread(MonitorConfig config)
// StorageManager doesn't send the "I'm online" msg to Proc*.
// Just mark it active for now. TODO: make it use the ping fcn in IDB* instead.
if (listPtr->ProcessName == "StorageManager")
{
log.writeLog(__LINE__, "StorageManager WTF? 3", LOG_TYPE_DEBUG);
oam.setProcessStatus("StorageManager", boost::get<0>(oam.getModuleInfo()),
oam::ACTIVE, listPtr->processID);
}
if ( (*listPtr).processID == oam::API_FAILURE )
{

22
procmon/processmonitor.cpp
View File

@ -662,11 +662,8 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
// StorageManager doesn't send the "I'm online" msg to Proc*.
// Just mark it active for now. TODO: make it use the ping fcn in IDB* instead.
if (processconfig.ProcessName == "StorageManager")
{
log.writeLog(__LINE__, "StorageManager WTF? 6", LOG_TYPE_DEBUG);
oam.setProcessStatus("StorageManager", boost::get<0>(oam.getModuleInfo()),
oam::ACTIVE, processID);
}
if ( processID > oam::API_MAX )
processID = oam::API_SUCCESS;
@ -766,11 +763,8 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
// StorageManager doesn't send the "I'm online" msg to Proc*.
// Just mark it active for now. TODO: make it use the ping fcn in IDB* instead.
if (listPtr->ProcessName == "StorageManager")
{
log.writeLog(__LINE__, "StorageManager WTF? 7", LOG_TYPE_DEBUG);
oam.setProcessStatus("StorageManager", boost::get<0>(oam.getModuleInfo()),
oam::ACTIVE, listPtr->processID);
}
if ( processID > oam::API_MAX )
processID = oam::API_SUCCESS;
@ -1214,11 +1208,8 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
// StorageManager doesn't send the "I'm online" msg to Proc*.
// Just mark it active for now. TODO: make it use the ping fcn in IDB* instead.
if (listPtr->ProcessName == "StorageManager")
{
log.writeLog(__LINE__, "StorageManager WTF? 4", LOG_TYPE_DEBUG);
oam.setProcessStatus("StorageManager", boost::get<0>(oam.getModuleInfo()),
oam::ACTIVE, processID);
}
if ( processID > oam::API_MAX )
{
@ -1289,11 +1280,8 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
// StorageManager doesn't send the "I'm online" msg to Proc*.
// Just mark it active for now. TODO: make it use the ping fcn in IDB* instead.
if (listPtr->ProcessName == "StorageManager")
{
log.writeLog(__LINE__, "StorageManager WTF? 5", LOG_TYPE_DEBUG);
oam.setProcessStatus("StorageManager", boost::get<0>(oam.getModuleInfo()),
oam::ACTIVE, processID);
}
if ( processID > oam::API_MAX )
processID = oam::API_SUCCESS;
@ -6318,15 +6306,7 @@ int ProcessMonitor::checkDataMount()
}
else if (DBRootStorageType == "storagemanager")
{
/* StorageManager isn't running yet.
IDBFileSystem &fs = IDBFactory::getFs(IDBDataFile::CLOUD);
bool up = fs.filesystemIsUp();
if (!up)
{
log.writeLog(__LINE__, "ERROR: StorageManager is down, check its log files", LOG_TYPE_CRITICAL);
return API_FAILURE;
}
*/
/* StorageManager isn't running yet. Can't check for writability here. */
return API_SUCCESS;
}

2
utils/idbdatafile/IDBPolicy.cpp
View File

@ -123,7 +123,7 @@ bool IDBPolicy::isLocalFile( const std::string& path )
//string fileExt = filepath.extension().c_str();
#endif
bool isXml = filepath.extension() == ".xml";
bool isDbrm = path.find("dbrm") != string::npos; // StorageManager: make this depend on config values
bool isDbrm = path.find("dbrm") != string::npos; // StorageManager: debatable whether dbrm files should go in the cloud
bool isVb = path.find("versionbuffer") != string::npos;
bool isScratch = path.find(s_hdfsRdwrScratch) == 0;