Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix undefined behavior in Scheduler calculations (#9538)

This commit is contained in:
Jan 2019-07-22 18:14:16 +02:00 committed by KVS85
parent d5840c125a
commit 2209d568d0
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arangod/Scheduler/SupervisedScheduler.cpp
View File

@ -309,7 +309,7 @@ void SupervisedScheduler::runWorker() {
{ {
std::lock_guard<std::mutex> guard(_mutexSupervisor); std::lock_guard<std::mutex> guard(_mutexSupervisor);
id = _numWorkers++; // increase the number of workers here, to obtains the id id = _numWorkers++; // increase the number of workers here, to obtain the id
// copy shared_ptr with worker state // copy shared_ptr with worker state
state = _workerStates.back(); state = _workerStates.back();
// inform the supervisor that this thread is alive // inform the supervisor that this thread is alive
@ -317,7 +317,18 @@ void SupervisedScheduler::runWorker() {
} }
state->_sleepTimeout_ms = 20 * (id + 1); state->_sleepTimeout_ms = 20 * (id + 1);
state->_queueRetryCount = (512 >> id) + 3; // cap the timeout to some boundary value
if (state->_sleepTimeout_ms >= 1000) {
state->_sleepTimeout_ms = 1000;
}
if (id < 32) {
// 512 >> 32 => undefined behavior
state->_queueRetryCount = (512 >> id) + 3;
} else {
// we want at least 3 retries
state->_queueRetryCount = 3;
}
while (true) { while (true) {
std::unique_ptr<WorkItem> work = getWork(state); std::unique_ptr<WorkItem> work = getWork(state);