diff options
Diffstat (limited to 'storage/src/vespa/storage/storageserver')
-rw-r--r-- | storage/src/vespa/storage/storageserver/mergethrottler.cpp | 3 | ||||
-rw-r--r-- | storage/src/vespa/storage/storageserver/mergethrottler.h | 22 |
2 files changed, 15 insertions, 10 deletions
diff --git a/storage/src/vespa/storage/storageserver/mergethrottler.cpp b/storage/src/vespa/storage/storageserver/mergethrottler.cpp index a17c77f6ca4..05e50492206 100644 --- a/storage/src/vespa/storage/storageserver/mergethrottler.cpp +++ b/storage/src/vespa/storage/storageserver/mergethrottler.cpp @@ -395,7 +395,8 @@ MergeThrottler::enqueueMerge( if (!validateNewMerge(mergeCmd, nodeSeq, msgGuard)) { return; } - _queue.emplace(msg, _queueSequence++); + const bool is_forwarded_merge = _disable_queue_limits_for_chained_merges && !mergeCmd.getChain().empty(); + _queue.emplace(msg, _queueSequence++, is_forwarded_merge); _metrics->queueSize.set(_queue.size()); } diff --git a/storage/src/vespa/storage/storageserver/mergethrottler.h b/storage/src/vespa/storage/storageserver/mergethrottler.h index 997477a4b70..da301172a3a 100644 --- a/storage/src/vespa/storage/storageserver/mergethrottler.h +++ b/storage/src/vespa/storage/storageserver/mergethrottler.h @@ -80,21 +80,25 @@ private: MessageType _msg; metrics::MetricTimer _startTimer; uint64_t _sequence; - - StablePriorityOrderingWrapper(const MessageType& msg, uint64_t sequence) - : _msg(msg), _startTimer(), _sequence(sequence) + bool _is_forwarded_merge; + + StablePriorityOrderingWrapper(const MessageType& msg, + uint64_t sequence, + bool is_forwarded_merge) noexcept + : _msg(msg), + _startTimer(), + _sequence(sequence), + _is_forwarded_merge(is_forwarded_merge) { } - bool operator==(const StablePriorityOrderingWrapper& other) const { - return (*_msg == *other._msg - && _sequence == other._sequence); - } - - bool operator<(const StablePriorityOrderingWrapper& other) const { + bool operator<(const StablePriorityOrderingWrapper& other) const noexcept { if (_msg->getPriority() < other._msg->getPriority()) { return true; } + if (_is_forwarded_merge != other._is_forwarded_merge) { + return _is_forwarded_merge; // Forwarded merges sort before non-forwarded merges. + } return (_sequence < other._sequence); } }; |