Commit 098fa86b authored by Amy Phillips's avatar Amy Phillips
Browse files

Merge branch 'security-bump-redis-version-13-11' into '13-11-stable'

Update Redis to 6.0.14

See merge request gitlab-org/security/omnibus-gitlab!121
commit 5a3a6f90a5f34b17c2af307932f39fa80958549b
Author: Igor <igorwwwwwwwwwwwwwwwwwwww@users.noreply.github.com>
Date: Thu Mar 25 15:16:03 2021 +0100
Backport (6.0): Introduce fast path to bypass expensive serveClientsBlockedOnKeyByModule call
This is a backport of #8689 to the 6.0 branch.
diff --git a/src/blocked.c b/src/blocked.c
index 396a71569..460362ceb 100644
--- a/src/blocked.c
+++ b/src/blocked.c
@@ -425,6 +425,10 @@ void serveClientsBlockedOnStreamKey(robj *o, readyList *rl) {
void serveClientsBlockedOnKeyByModule(readyList *rl) {
dictEntry *de;
+ /* Optimization: If no clients are in type BLOCKED_MODULE,
+ * we can skip this loop. */
+ if (!server.blocked_clients_by_type[BLOCKED_MODULE]) return;
+
/* We serve clients in the same order they blocked for
* this key, from the first blocked to the last. */
de = dictFind(rl->db->blocking_keys,rl->key);
......@@ -23,7 +23,7 @@ license_file 'COPYING'
skip_transitive_dependency_licensing true
dependency 'config_guess'
version = Gitlab::Version.new('redis', '6.0.12')
version = Gitlab::Version.new('redis', '6.0.14')
default_version version.print(false)
source git: version.remote
......@@ -60,15 +60,6 @@ build do
# - https://github.com/redis/redis/commit/445a4b669a3a7232a18bf23340c5f7d580aa92c7.patch
patch source: 'upstream-backport-pull-request-7707.patch'
# We are backporting this patch from the (unstable) Redis 6.4 branch,
# in order to address a performance regression that was introduced in
# Redis 6.0. This performance regression primarily affects BRPOP heavy
# workloads, such as sidekiq.
#
# - https://github.com/redis/redis/pull/8689
# - https://gitlab.com/gitlab-com/gl-infra/infrastructure/-/issues/12896
patch source: 'blocked-module-fast-path.patch'
update_config_guess
make "-j #{workers}", env: env
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment