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

MCOL-1474 Catch errors in PriorityThreadPool

Browse Source 
PriorityThreadPool errors cause crashes in PrimProc. This patch catches
the errors and causes the thread to end cleanly.
This commit is contained in:
Andrew Hutchings
2018-06-14 14:43:37 +01:00
parent 4a20da68ac
commit 250d90a9bc
1 changed files with 100 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
utils/threadpool/prioritythreadpool.cpp
View File

@ -111,64 +111,113 @@ void PriorityThreadPool::threadFcn(const Priority preferredQueue) throw()
uint32_t rescheduleCount; uint32_t rescheduleCount;
uint32_t queueSize; uint32_t queueSize;
while (!_stop) { try
{
while (!_stop) {
mutex::scoped_lock lk(mutex); mutex::scoped_lock lk(mutex);
queue = pickAQueue(preferredQueue); queue = pickAQueue(preferredQueue);
if (jobQueues[queue].empty()) { if (jobQueues[queue].empty()) {
newJob.wait(lk); newJob.wait(lk);
continue; continue;
} }
queueSize = jobQueues[queue].size(); queueSize = jobQueues[queue].size();
weight = 0; weight = 0;
// 3 conditions stop this thread from grabbing all jobs in the queue // 3 conditions stop this thread from grabbing all jobs in the queue
// //
// 1: The weight limit has been exceeded // 1: The weight limit has been exceeded
// 2: The queue is empty // 2: The queue is empty
// 3: It has grabbed more than half of the jobs available & // 3: It has grabbed more than half of the jobs available &
// should leave some to the other threads // should leave some to the other threads
while ((weight < weightPerRun) && (!jobQueues[queue].empty()) while ((weight < weightPerRun) && (!jobQueues[queue].empty())
&& (runList.size() <= queueSize/2)) { && (runList.size() <= queueSize/2)) {
runList.push_back(jobQueues[queue].front()); runList.push_back(jobQueues[queue].front());
jobQueues[queue].pop_front(); jobQueues[queue].pop_front();
weight += runList.back().weight; weight += runList.back().weight;
} }
lk.unlock(); lk.unlock();
reschedule.resize(runList.size()); reschedule.resize(runList.size());
rescheduleCount = 0; rescheduleCount = 0;
for (i = 0; i < runList.size() && !_stop; i++) { for (i = 0; i < runList.size() && !_stop; i++) {
try { try {
reschedule[i] = false; reschedule[i] = false;
reschedule[i] = (*(runList[i].functor))(); reschedule[i] = (*(runList[i].functor))();
if (reschedule[i]) if (reschedule[i])
rescheduleCount++; rescheduleCount++;
} }
catch (std::exception &e) { catch (std::exception &e) {
cerr << e.what() << endl; cerr << e.what() << endl;
} }
} }
// no real work was done, prevent intensive busy waiting // no real work was done, prevent intensive busy waiting
if (rescheduleCount == runList.size()) if (rescheduleCount == runList.size())
usleep(1000); usleep(1000);
if (rescheduleCount > 0) { if (rescheduleCount > 0) {
lk.lock(); lk.lock();
for (i = 0; i < runList.size(); i++) for (i = 0; i < runList.size(); i++)
if (reschedule[i]) if (reschedule[i])
addJob(runList[i], false); addJob(runList[i], false);
if (rescheduleCount > 1) if (rescheduleCount > 1)
newJob.notify_all(); newJob.notify_all();
else else
newJob.notify_one(); newJob.notify_one();
lk.unlock(); lk.unlock();
} }
runList.clear(); runList.clear();
} }
}
catch (std::exception &ex)
{
// Log the exception and exit this thread
try
{
#ifndef NOLOGGING
logging::Message::Args args;
logging::Message message(5);
args.add("threadFcn: Caught exception: ");
args.add(ex.what());
message.format( args );
logging::LoggingID lid(22);
logging::MessageLog ml(lid);
ml.logErrorMessage( message );
#endif
}
catch (...)
{
}
}
catch (...)
{
// Log the exception and exit this thread
try
{
#ifndef NOLOGGING
logging::Message::Args args;
logging::Message message(6);
args.add("threadFcn: Caught unknown exception!");
message.format( args );
logging::LoggingID lid(22);
logging::MessageLog ml(lid);
ml.logErrorMessage( message );
#endif
}
catch (...)
{
}
}
} }
void PriorityThreadPool::stop() void PriorityThreadPool::stop()