fix undefined behavior in Scheduler calculations (#9538)

jsteemann · KVS85 · commit 2209d568d0d3 · 2019-07-22T19:14:16.000+03:00
diff --git a/arangod/Scheduler/SupervisedScheduler.cpp b/arangod/Scheduler/SupervisedScheduler.cpp
@@ -309,15 +309,26 @@ void SupervisedScheduler::runWorker() {
 
   {
     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
     state = _workerStates.back();
     // inform the supervisor that this thread is alive
     _conditionSupervisor.notify_one();
   }
 
   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) {
     std::unique_ptr<WorkItem> work = getWork(state);
