Skip to content

Commit d6fba1b

Browse files
twk3balasankarc
andcommitted
Merge branch '7276-bump-redis-7' into 'master'
Bump Redis version to 7.0.12 Closes #7276 See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7015 Merged-by: DJ Mountney <[email protected]> Approved-by: Andrew Patterson <[email protected]> Co-authored-by: Balasankar "Balu" C <[email protected]>
2 parents 3213ce1 + 26c8c95 commit d6fba1b

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
diff --git a/deps/Makefile b/deps/Makefile
2-
index ff16ee9e1..30750fc5d 100644
2+
index 8592e1766..08da5ce20 100644
33
--- a/deps/Makefile
44
+++ b/deps/Makefile
5-
@@ -88,7 +88,7 @@ JEMALLOC_LDFLAGS= $(LDFLAGS)
5+
@@ -99,7 +99,7 @@ endif
66

77
jemalloc: .make-prerequisites
88
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
9-
- cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
10-
+ cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ $(EXTRA_JEMALLOC_CONFIGURE_FLAGS) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
9+
- cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
10+
+ cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ $(EXTRA_JEMALLOC_CONFIGURE_FLAGS) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
1111
cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
1212

1313
.PHONY: jemalloc

config/software/redis.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
dependency 'config_guess'
2626
dependency 'openssl' unless Build::Check.use_system_ssl?
2727

28-
version = Gitlab::Version.new('redis', '6.2.11')
28+
version = Gitlab::Version.new('redis', '7.0.12')
2929
default_version version.print(false)
3030

3131
source git: version.remote

doc/update/gitlab_16_changes.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,22 @@ info: To determine the technical writer assigned to the Stage/Group associated w
99
NOTE:
1010
When upgrading to a new major version, remember to first [check for background migrations](https://docs.gitlab.com/ee/update/index.html#checking-for-background-migrations-before-upgrading).
1111

12+
## 16.2
13+
14+
### Redis 7.0.12
15+
16+
In 16.2, we are upgrading Redis from 6.2.11 to 7.0.12. This upgrade is expected
17+
to be fully backwards compatible.
18+
19+
Redis will not be automatically restarted as part of `gitlab-ctl reconfigure`.
20+
Hence, users are manually required to run `sudo gitlab-ctl restart redis` after
21+
the reconfigure run so that the new Redis version gets used. A warning
22+
mentioning that the installed Redis version is different than the one running is
23+
displayed at the end of reconfigure run until the restart is performed.
24+
25+
If your instance has Redis HA with Sentinel, follow the upgrade steps mentioned in
26+
[Zero Downtime documentation](https://docs.gitlab.com/ee/update/zero_downtime.html#redis-ha-using-sentinel).
27+
1228
## 16.0
1329

1430
### PostgreSQL 12 removal

0 commit comments

Comments
 (0)