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

Merge branch 'develop-1.2' into develop-merge-up-20190924-2

Browse Source
This commit is contained in:
Andrew Hutchings
2019-09-24 14:17:57 +01:00
parent 66d59a760d 622e5fac53
commit 70b3aa3159
25 changed files with 304 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
procmon/processmonitor.cpp
View File

@ -2616,11 +2616,17 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName,
tmp = tmp.filename();
DBRMroot = (bf::path(DBRMDir) / tmp).string();
// DBRMDir might have changed, so need to change DBRMroot
bf::path tmp(DBRMroot);
tmp = tmp.filename();
DBRMroot = (bf::path(DBRMDir) / tmp).string();
sendAlarm("DBRM", DBRM_LOAD_DATA_ERROR, CLEAR);
// change DBRMroot to temp DBRMDir path
// DBRMroot = tempDBRMDir + "/BRM_saves";
}
//
// run the 'load_brm' script first if files exist
//
@ -4420,6 +4426,12 @@ int ProcessMonitor::getDBRMdata(string *path)
*path = pTmp.string();
log.writeLog(__LINE__, "Downloading DBRM files to " + *path, LOG_TYPE_DEBUG);
boost::uuids::uuid u = boost::uuids::random_generator()();
bf::path pTmp = bf::path(*path) / boost::uuids::to_string(u);
bf::create_directories(pTmp);
*path = pTmp.string();
log.writeLog(__LINE__, "Downloading DBRM files to " + *path, LOG_TYPE_DEBUG);
for ( int i = 0 ; i < numFiles ; i ++ )
{
string fileName;
@ -4464,6 +4476,10 @@ int ProcessMonitor::getDBRMdata(string *path)
pFilename = pTmp / pFilename.filename();
const char *cFilename = pFilename.string().c_str();
bf::path pFilename(fileName);
pFilename = pTmp / pFilename.filename();
const char *cFilename = pFilename.string().c_str();
boost::scoped_ptr<IDBDataFile> out(IDBDataFile::open(
IDBPolicy::getType(cFilename,
IDBPolicy::WRITEENG),
@ -6359,7 +6375,6 @@ int ProcessMonitor::checkDataMount()
/* StorageManager isn't running yet. Can't check for writability here. */
return API_SUCCESS;
}
//go unmount disk NOT assigned to this pm
unmountExtraDBroots();