database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-27 16:01:57 +03:00
Code Activity

Fix the _journal file path for getDBRMData if it was not received because it is 0 length. remove extra log lines.

Browse Source
This commit is contained in:
benthompson15
2020-04-08 18:58:57 -05:00
parent 699b55d8dd
commit 4bd3ceb24d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
procmon/processmonitor.cpp
View File

@@ -4437,9 +4437,9 @@ int ProcessMonitor::getDBRMdata(string *path)
//create journal file if none come across //create journal file if none come across
if ( !journalFile) if ( !journalFile)
{ {
string journalFilename = "/var/lib/columnstore/data1/systemFiles/dbrm/BRM_saves_journal"; bf::path pJournalFilename(pTmp / "BRM_saves_journal");
IDBDataFile *idbJournalFile = IDBDataFile::open(IDBPolicy::getType(journalFilename.c_str(), IDBDataFile *idbJournalFile = IDBDataFile::open(IDBPolicy::getType(pJournalFilename.string().c_str(),
IDBPolicy::WRITEENG), journalFilename.c_str(), "w", 0); IDBPolicy::WRITEENG), pJournalFilename.string().c_str(), "w", 0);
delete idbJournalFile; delete idbJournalFile;
//string cmd = "touch " + startup::StartUp::installDir() + "/data1/systemFiles/dbrm/BRM_saves_journal"; //string cmd = "touch " + startup::StartUp::installDir() + "/data1/systemFiles/dbrm/BRM_saves_journal";
//system(cmd.c_str()); //system(cmd.c_str());
@@ -6138,7 +6138,7 @@ int ProcessMonitor::glusterAssign(std::string dbrootID)
if ( WEXITSTATUS(ret) != 0 ) if ( WEXITSTATUS(ret) != 0 )
{ {
log.writeLog(__LINE__, "glusterAssign mount failure: dbroot: " + dbrootID + " error: " + oam.itoa(WEXITSTATUS(ret)), LOG_TYPE_ERROR); //log.writeLog(__LINE__, "glusterAssign mount failure: dbroot: " + dbrootID + " error: " + oam.itoa(WEXITSTATUS(ret)), LOG_TYPE_ERROR);
ifstream in(tmpLog.c_str()); ifstream in(tmpLog.c_str());
in.seekg(0, std::ios::end); in.seekg(0, std::ios::end);
@@ -6183,7 +6183,7 @@ int ProcessMonitor::glusterUnassign(std::string dbrootID)
if ( WEXITSTATUS(ret) != 0 ) if ( WEXITSTATUS(ret) != 0 )
{ {
log.writeLog(__LINE__, "glusterUnassign mount failure: dbroot: " + dbrootID + " error: " + oam.itoa(WEXITSTATUS(ret)), LOG_TYPE_ERROR); //log.writeLog(__LINE__, "glusterUnassign mount failure: dbroot: " + dbrootID + " error: " + oam.itoa(WEXITSTATUS(ret)), LOG_TYPE_ERROR);
ifstream in(tmpLog.c_str()); ifstream in(tmpLog.c_str());
in.seekg(0, std::ios::end); in.seekg(0, std::ios::end);