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

minimum fixes to clear scheduler timeout problem. (#6878)

This commit is contained in:
Matthew Von-Maszewski 2018-10-15 09:06:15 +02:00 committed by Max Neunhöffer
parent 82ee14161c
commit 25bc48e548
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arangod/Scheduler/Scheduler.cpp
View File

@ -426,12 +426,12 @@ bool Scheduler::canPostDirectly(RequestPriority prio) const noexcept {
switch (prio) { switch (prio) {
case RequestPriority::HIGH: case RequestPriority::HIGH:
// return nrWorking + nrQueued <= _maxQueuedHighPrio; // return nrWorking + nrQueued <= _maxQueuedHighPrio;
return nrWorking + nrQueued <= _maxThreads; return nrWorking + nrQueued < _maxThreads;
case RequestPriority::LOW: case RequestPriority::LOW:
case RequestPriority::V8: case RequestPriority::V8:
// return nrWorking + nrQueued <= _maxQueuedLowPrio; // return nrWorking + nrQueued <= _maxQueuedLowPrio;
return nrWorking + nrQueued <= _maxThreads - _minThreads; return nrWorking + nrQueued < _maxThreads - _minThreads;
} }
return false; return false;
@ -737,10 +737,13 @@ bool Scheduler::threadShouldStop(double now) {
// I reactivated the following at the last hour before 3.4.RC3 without // I reactivated the following at the last hour before 3.4.RC3 without
// being able to consult with Matthew. If this breaks things, we find // being able to consult with Matthew. If this breaks things, we find
// out in due course. 12.10.2018 Max. // out in due course. 12.10.2018 Max.
#if 0
// decrement nrRunning by one already in here while holding the lock // decrement nrRunning by one already in here while holding the lock
decRunning(); decRunning();
return true; return true;
#else
return false;
#endif
} }
void Scheduler::startNewThread() { void Scheduler::startNewThread() {

2
arangod/Scheduler/SchedulerFeature.h
View File

@ -53,7 +53,7 @@ class SchedulerFeature final : public application_features::ApplicationFeature {
uint64_t queueSize() const { return _queueSize; } uint64_t queueSize() const { return _queueSize; }
private: private:
uint64_t _nrMinimalThreads = 2; uint64_t _nrMinimalThreads = 0;
uint64_t _nrMaximalThreads = 0; uint64_t _nrMaximalThreads = 0;
uint64_t _queueSize = 128; uint64_t _queueSize = 128;
uint64_t _fifo1Size = 1024 * 1024; uint64_t _fifo1Size = 1024 * 1024;