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-4193: Delete unused OAM and applications, ProcMon, ProcMgr, and no longer build all tools for packages

Browse Source
This commit is contained in:
benthompson15
2020-12-02 13:14:25 -06:00
parent d2cc656fdf
commit 846f7fb29b
138 changed files with 311 additions and 69494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
versioning/BRM/masterdbrmnode.cpp
View File

@ -27,8 +27,6 @@
#include "sessionmanager.h"
#include "socketclosed.h"
#include "alarmglobal.h"
#include "alarmmanager.h"
#include "liboamcpp.h"
#include "stopwatch.h"
#include "masterdbrmnode.h"
@ -69,24 +67,6 @@
for (it = responses.begin(); it != responses.end(); it++) \
delete *it; }
#if 1
#define SEND_ALARM \
try { \
alarmmanager::ALARMManager alarmMgr; \
alarmMgr.sendAlarmReport("System", oam::DBRM_READ_ONLY, alarmmanager::SET); \
} \
catch (...) { }
#define CLEAR_ALARM \
try { \
alarmmanager::ALARMManager alarmMgr; \
alarmMgr.sendAlarmReport("System", oam::DBRM_READ_ONLY, alarmmanager::CLEAR); \
} \
catch (...) { }
#else
#define SEND_ALARM
#define CLEAR_ALARM
#endif
using namespace std;
using namespace messageqcpp;
using namespace logging;
@ -302,8 +282,6 @@ void MasterDBRMNode::run()
IOSocket* s;
boost::thread* reader;
CLEAR_ALARM
while (!die)
{
s = new IOSocket();
@ -648,7 +626,6 @@ retrycmd:
if (readOnly)
{
SEND_ALARM
slaveLock.unlock();
sendError(p->sock, ERR_READONLY);
goto out;
@ -762,7 +739,6 @@ retrycmd:
{
if (!halting)
{
SEND_ALARM
undo();
readOnly = true;
slaveLock.unlock();
@ -850,7 +826,6 @@ retrycmd:
{
if (!halting)
{
SEND_ALARM
ostringstream ostr;
ostr << "DBRM Controller: Caught network error. "
"Confirming command " << (uint32_t)cmd <<
@ -1034,8 +1009,6 @@ int MasterDBRMNode::compareResponses(uint8_t cmd,
}
catch (exception&)
{
SEND_ALARM
readOnly = true;
ostringstream os;
os << "DBRM Controller: Network error on node 1. "
@ -1055,8 +1028,6 @@ int MasterDBRMNode::compareResponses(uint8_t cmd,
for (it = responses.begin(), it2 = it + 1, i = 2; it2 != responses.end(); it++, it2++, i++)
if (**it != **it2 && !halting)
{
SEND_ALARM
ostringstream ostr;
#ifdef BRM_VERBOSE
cerr << "DBRM Controller: error: response from node " << i << " is different" << endl;

33
versioning/BRM/masternode.cpp
View File

@ -48,21 +48,6 @@ bool die= false;
using namespace std;
using namespace BRM;
void fail()
{
try
{
oam::Oam oam;
oam.processInitFailure();
}
catch (exception&)
{
cerr << "failed to notify OAM of server failure" << endl;
}
}
class Opt
{
protected:
@ -89,7 +74,6 @@ public:
{
perror(m_progname);
log_errno(std::string(m_progname));
fail();
}
void ParentLogChildMessage(const std::string &str) override
{
@ -189,22 +173,6 @@ int ServiceControllerNode::Child()
NotifyServiceStarted();
try
{
oam::Oam oam;
oam.processInitComplete("DBRMControllerNode");
}
catch (exception& e)
{
ostringstream os;
os << "failed to notify OAM: " << e.what();
os << " continuing anyway";
cerr << os.str() << endl;
log(os.str(), logging::LOG_TYPE_WARNING);
}
m->run();
retries = 0;
delete m;
@ -227,7 +195,6 @@ int ServiceControllerNode::Child()
{
NotifyServiceInitializationFailed();
log(string("Exiting after too many errors"));
fail();
return 1;
}

33
versioning/BRM/slavenode.cpp
View File

@ -49,21 +49,6 @@ SlaveComm* comm;
bool die= false;
boost::thread_group monitorThreads;
void fail()
{
try
{
oam::Oam oam;
oam.processInitFailure();
}
catch (exception&)
{
cerr << "failed to notify OAM of server failure" << endl;
}
}
class Opt
{
protected:
@ -92,7 +77,6 @@ public:
{
perror(m_progname);
log_errno(std::string(m_progname));
fail();
}
void ParentLogChildMessage(const std::string &str) override
{
@ -160,7 +144,6 @@ int ServiceWorkerNode::Child()
os << "An error occured: " << e.what();
cerr << os.str() << endl;
log(os.str());
fail();
NotifyServiceInitializationFailed();
return 1;
}
@ -175,21 +158,6 @@ int ServiceWorkerNode::Child()
monitorThreads.create_thread(RWLockMonitor
(&die, slave.getVSSLockStatus(), keys.KEYRANGE_VSS_BASE));
try
{
oam::Oam oam;
oam.processInitComplete("DBRMWorkerNode");
}
catch (exception& e)
{
ostringstream os;
os << "failed to notify OAM: " << e.what();
os << " continuing anyway";
cerr << os.str() << endl;
log(os.str(), logging::LOG_TYPE_WARNING);
}
try
{
comm->run();
@ -228,7 +196,6 @@ int main(int argc, char** argv)
os << "Usage: " << argv[0] << " DBRM_WorkerN";
cerr << os.str() << endl;
log(os.str());
fail();
exit(1);
}