Skip to content
Snippets Groups Projects
Commit 58ab08f5d5df authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'redis-6.2' into 'master'

Upgrade Redis to 6.2

See merge request gitlab-org/omnibus-gitlab!5843
No related branches found
No related tags found
2 merge requests!65heptapod#658: intermediate release to test the shift,!64GitLab 14.8
diff --git a/deps/Makefile b/deps/Makefile
index 700867f3b..03fd9ecb9 100644
index ff16ee9e1..30750fc5d 100644
--- a/deps/Makefile
+++ b/deps/Makefile
......@@ -3,6 +3,6 @@
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -81,7 +81,7 @@ JEMALLOC_LDFLAGS= $(LDFLAGS)
@@ -88,7 +88,7 @@ JEMALLOC_LDFLAGS= $(LDFLAGS)
jemalloc: .make-prerequisites
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
......@@ -6,8 +6,8 @@
jemalloc: .make-prerequisites
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
- cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
+ cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence $(EXTRA_JEMALLOC_CONFIGURE_FLAGS) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
- cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
+ 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)"
cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
.PHONY: jemalloc
This diff is collapsed.
......@@ -25,7 +25,7 @@
dependency 'config_guess'
dependency 'openssl' unless Build::Check.use_system_ssl?
version = Gitlab::Version.new('redis', '6.0.16')
version = Gitlab::Version.new('redis', '6.2.6')
default_version version.print(false)
source git: version.remote
......@@ -53,15 +53,6 @@
patch source: 'jemalloc-extra-config-flags.patch'
# We are backporting this commit from the (unstable) Redis 6.2 branch,
# in order to get Redis 6.0 to compile on centos7. This patch adds support
# for an older version of GCC.
#
# - https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/4930#note_490191430
# - https://github.com/redis/redis/pull/7707
# - https://github.com/redis/redis/commit/445a4b669a3a7232a18bf23340c5f7d580aa92c7.patch
patch source: 'upstream-backport-pull-request-7707.patch'
update_config_guess
make "-j #{workers} BUILD_TLS=yes", env: env
......
......@@ -9,6 +9,16 @@
NOTE:
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).
## 14.7
### Redis 6.2.6
In 14.8, we are upgrading Redis from 6.0.16 to 6.2.6. This upgrade is expected
to be fully backwards compatible.
If your instance has Redis HA with Sentinel, follow the upgrade steps documented in
[Update GitLab installed with the Omnibus GitLab package](https://docs.gitlab.com/ee/update/zero_downtime.html#use-redis-ha-using-sentinel)
## 14.4
### Downgrading Grafana from 8.1 to 7.5
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment