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

MCOL-520

Browse Source
This commit is contained in:
David Hill
2018-09-25 11:32:56 -05:00
parent bb355df98c
commit b7b98a3e1a
20 changed files with 185 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
versioning/BRM/slavecomm.cpp
View File

@ -43,6 +43,8 @@
#include "slavecomm.h"
#undef SLAVECOMM_DLLEXPORT
#include "installdir.h"
using namespace std;
using namespace messageqcpp;
using namespace idbdatafile;
@ -98,6 +100,8 @@ SlaveComm::SlaveComm(string hostname, SlaveDBRMNode* s) :
}
}
}
string tmpDir = startup::StartUp::tmpDir();
/* NOTE: this string has to match whatever is designated as the first slave */
if (hostname == "DBRM_Worker1")
@ -108,11 +112,11 @@ SlaveComm::SlaveComm(string hostname, SlaveDBRMNode* s) :
}
catch (exception& e)
{
savefile = "/tmp/BRM_SaveFiles";
savefile = tmpDir + "/BRM_SaveFiles";
}
if (savefile == "")
savefile = "/tmp/BRM_SaveFiles";
savefile = tmpDir + "/BRM_SaveFiles";
tmp = "";
@ -181,17 +185,19 @@ SlaveComm::SlaveComm()
{
config::Config* config = config::Config::makeConfig();
string tmpDir = startup::StartUp::tmpDir();
try
{
savefile = config->getConfig("SystemConfig", "DBRMRoot");
}
catch (exception& e)
{
savefile = "/tmp/BRM_SaveFiles";
savefile = tmpDir + "/BRM_SaveFiles";
}
if (savefile == "")
savefile = "/tmp/BRM_SaveFiles";
savefile = tmpDir + "/BRM_SaveFiles";
journalName = savefile + "_journal";