database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-09-01 01:22:04 +03:00
Code Activity

Merge branch 'develop' into S3-project

Browse Source
This commit is contained in:
Patrick LeBlanc
2019-08-14 15:37:14 -05:00
parent 73c455c949 4a4d35180a
commit fbdf1a5308
245 changed files with 3356 additions and 3224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
procmon/main.cpp
View File

@@ -394,12 +394,12 @@ int main(int argc, char** argv)
// check if standby never replied, if so, shutdown
if ( count >= 120 )
{
log.writeLog(__LINE__, "Standby PM not responding, infinidb shutting down", LOG_TYPE_CRITICAL);
log.writeLog(__LINE__, "Standby PM not responding, ColumnStore shutting down", LOG_TYPE_CRITICAL);
//Set the alarm
// aMonitor.sendAlarm(config.moduleName().c_str(), STARTUP_DIAGNOTICS_FAILURE, SET);
// sleep (1);
string cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /dev/null 2>&1";
string cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /dev/null 2>&1";
system(cmd.c_str());
}

10
procmon/processmonitor.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -5185,11 +5185,11 @@ int ProcessMonitor::changeMyCnf(std::string type)
// set local query flag if on pm
if ( (PMwithUM == "y") && config.moduleType() == "pm" )
{
pos = buf.find("infinidb_local_query", 0);
pos = buf.find("columnstore_local_query", 0);
if ( pos != string::npos )
{
buf = "infinidb_local_query=1";
buf = "columnstore_local_query=1";
string command = "SET GLOBAL " + buf + ";";
@@ -5205,11 +5205,11 @@ int ProcessMonitor::changeMyCnf(std::string type)
else
{
// disable, if needed
pos = buf.find("infinidb_local_query", 0);
pos = buf.find("columnstore_local_query", 0);
if ( pos != string::npos )
{
buf = "infinidb_local_query=0";
buf = "columnstore_local_query=0";
string command = "SET GLOBAL " + buf + ";";
int ret = runMariaDBCommandLine(command);