database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-4483: Fix and consolidate log files and cpimport logging.

Browse Source
This commit is contained in:
benthompson15
2021-01-20 12:04:52 -06:00
parent ceae2118a2
commit afa88866bb
32 changed files with 172 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
primitives/blockcache/blockrequestprocessor.cpp
View File

@ -34,6 +34,7 @@ using namespace std;
#include "rwlock_local.h"
#include "dbrm.h"
#include "pp_logger.h"
#include "mcsconfig.h"
namespace dbbc
{
@ -69,7 +70,7 @@ BlockRequestProcessor::BlockRequestProcessor(uint32_t numBlcks,
#ifdef _MSC_VER
brpLogFileName << "C:/Calpont/log/trace/brp." << tid;
#else
brpLogFileName << "/var/log/mariadb/columnstore/trace/brp." << tid;
brpLogFileName << MCSLOGDIR << "/trace/brp." << tid;
#endif
fLogFile.open(brpLogFileName.str().c_str(), ios_base::app | ios_base::ate);
}

3
primitives/blockcache/filebuffermgr.cpp
View File

@ -41,6 +41,7 @@
#include "stats.h"
#include "configcpp.h"
#include "filebuffermgr.h"
#include "mcsconfig.h"
using namespace config;
using namespace boost;
@ -73,7 +74,7 @@ FileBufferMgr::FileBufferMgr(const uint32_t numBlcks, const uint32_t blkSz, cons
#ifdef _MSC_VER
fLog.open("C:/Calpont/log/trace/bc", ios_base::app | ios_base::ate);
#else
fLog.open("/var/log/mariadb/columnstore/trace/bc", ios_base::app | ios_base::ate);
fLog.open(string(MCSLOGDIR) + "/trace/bc", ios_base::app | ios_base::ate);
#endif
}

6
primitives/blockcache/iomanager.cpp
View File

@ -103,6 +103,8 @@ using namespace compress;
#include "IDBLogger.h"
using namespace idbdatafile;
#include "mcsconfig.h"
typedef tr1::unordered_set<BRM::OID_t> USOID;
namespace primitiveprocessor
@ -454,7 +456,7 @@ void* thr_popper(ioManager* arg)
iomLogFileName << "C:/Calpont/log/trace/iom." << threadId;
#else
threadId = pthread_self();
iomLogFileName << "/var/log/mariadb/columnstore/trace/iom." << threadId;
iomLogFileName << MCSLOGDIR << "/trace/iom." << threadId;
#endif
lFile.open(iomLogFileName.str().c_str(), ios_base::app | ios_base::ate);
}
@ -1351,7 +1353,7 @@ ioManager::ioManager(FileBufferMgr& fbm,
#ifdef _MSC_VER
FDTraceFile().open("C:/Calpont/log/trace/fdcache", ios_base::ate | ios_base::app);
#else
FDTraceFile().open("/var/log/mariadb/columnstore/trace/fdcache", ios_base::ate | ios_base::app);
FDTraceFile().open(string(MCSLOGDIR) + "/trace/fdcache", ios_base::ate | ios_base::app);
#endif
}

3
primitives/blockcache/stats.cpp
View File

@ -42,6 +42,7 @@ using namespace boost;
#include "stats.h"
#include "messagelog.h"
#include "exceptclasses.h"
#include "mcsconfig.h"
using namespace BRM;
@ -110,7 +111,7 @@ public:
#ifdef _MSC_VER
oss << "C:/Calpont/log/trace/" << outName << '.' << sessionID;
#else
oss << "/var/log/mariadb/columnstore/trace/" << outName << '.' << sessionID;
oss << MCSLOGDIR << "/trace/" << outName << '.' << sessionID;
#endif
oFile.reset(new ofstream());
oFile->open(oss.str().c_str(), ios_base::out | ios_base::ate | ios_base::app);

3
primitives/primproc/bppseeder.cpp
View File

@ -45,6 +45,7 @@ typedef int pthread_t;
#include "errorcodes.h"
#include "calpontsystemcatalog.h"
#include "blockcacheclient.h"
#include "mcsconfig.h"
using namespace messageqcpp;
using namespace std;
@ -256,7 +257,7 @@ int BPPSeeder::operator()()
#ifdef _MSC_VER
LogFileName << "C:/Calpont/log/trace/pt." << tid;
#else
LogFileName << "/var/log/mariadb/columnstore/trace/pt." << tid;
LogFileName << MCSLOGDIR << "/trace/pt." << tid;
#endif
spof.reset(new PTLogs_t(gThdCnt, LogFileName.str().c_str()));
gThdCnt++;

8
primitives/primproc/primproc.cpp
View File

@ -331,16 +331,12 @@ void* waitForSIGUSR1(void* p)
if (rec_sig == SIGUSR1)
{
#ifdef _MSC_VER
ofstream out("C:/Calpont/log/trace/pplru.dat");
#else
ofstream out("/var/log/mariadb/columnstore/trace/pplru.dat");
#endif
ostringstream out;
for (int i = 0; i < cacheCount; i++)
{
BRPp[i]->formatLRUList(out);
out << "###" << endl;
cout << out.str() << "###" << endl;
}
}
else if (rec_sig == SIGUSR2)