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

MCOL-259 add some retry logic to the OAMCache system. Add that degraded is still valid for a PM.

Browse Source
This commit is contained in:
David Hall
2016-08-23 16:50:56 -05:00
parent 7a47ad9f1d
commit 482047679a
6 changed files with 61 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
oam/oamcpp/oamcache.cpp
View File

@ -106,20 +106,36 @@ void OamCache::checkReload()
#if !defined(SKIP_OAM_INIT)
{
try {
int state = oam::ACTIVE; bool degraded;
int state = oam::MAN_INIT;
bool degraded;
char num[80];
int retry = 0;
// MCOL-259 retry for 5 seconds if the PM is in some INIT mode.
while (( state == oam::BUSY_INIT
|| state == oam::MAN_INIT
|| state == oam::PID_UPDATE)
&& retry < 5)
{
snprintf(num, 80, "%d", *it);
try {
oam.getModuleStatus(string("pm") + num, state, degraded);
}
catch (...) {break;}
snprintf(num, 80, "%d", *it);
try {
oam.getModuleStatus(string("pm") + num, state, degraded);
}
catch (...) {}
if (state == oam::ACTIVE) {
pmToConnectionMap[*it] = i++;
moduleIds.push_back(*it);
if (state == oam::ACTIVE || state == oam::DEGRADED) {
pmToConnectionMap[*it] = i++;
moduleIds.push_back(*it);
break;
}
sleep(1);
//cout << "pm " << *it << " -> connection " << (i-1) << endl;
}
if (state != oam::ACTIVE)
{
ostringstream os;
os << "OamCache::checkReload shows state for pm" << num << " as " << state;
oam.writeLog(os.str(), logging::LOG_TYPE_WARNING);
}
}
catch (...) { /* doesn't get added to the connection map */ }
}