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 'fix-skip-oam-init' into MCOL-520

Browse Source
This commit is contained in:
Patrick LeBlanc
2018-10-04 15:35:32 -05:00
parent 4215a47b5c faaee9141a
commit f97dec3406
7 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
exemgr/main.cpp
View File

@ -63,6 +63,7 @@ using namespace std;
#include <boost/scoped_ptr.hpp>
using namespace boost;
#include "config.h"
#include "configcpp.h"
using namespace config;
#include "messagequeue.h"
@ -100,6 +101,10 @@ using namespace querytele;
#include "threadpool.h"
#include "crashtrace.h"
#if defined(SKIP_OAM_INIT)
#include "dbrm.h"
#endif
#include "installdir.h"
namespace
@ -1322,8 +1327,11 @@ void setupSignalHandlers()
void setupCwd(ResourceManager* rm)
{
string workdir = startup::StartUp::tmpDir();
string workdir = rm->getScWorkingDir();
(void)chdir(workdir.c_str());
if (access(".", W_OK) != 0)
(void)chdir("/tmp");
}
void startRssMon(size_t maxPct, int pauseSeconds)
@ -1370,11 +1378,14 @@ void cleanTempDir()
{
config::Config* config = config::Config::makeConfig();
string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin");
string tmpPrefix = startup::StartUp::tmpDir();
string tmpPrefix = config->getConfig("HashJoin", "TempFilePath");
if (allowDJS == "N" || allowDJS == "n")
return;
if (tmpPrefix.empty())
tmpPrefix = "/tmp/infinidb";
tmpPrefix += "/";
assert(tmpPrefix != "/");
@ -1597,6 +1608,11 @@ int main(int argc, char* argv[])
{
}
}
#if defined(SKIP_OAM_INIT)
BRM::DBRM *dbrm = new BRM::DBRM();
dbrm->setSystemQueryReady(true);
delete dbrm;
#endif
threadpool::ThreadPool exeMgrThreadPool(serverThreads, 0);
exeMgrThreadPool.setName("ExeMgrServer");