Commit 3086cf92 authored by Noah Hilverling's avatar Noah Hilverling
Browse files

Merge branch 'update/6.2.4' into 'master'

Update to v6.2.4

Closes #1

See merge request !10
parents d8c83a23 3f279f3c
Pipeline #22489 failed with stages
in 26 seconds
......@@ -66,6 +66,9 @@ build/centos/7:
<<: *build
variables:
DOCKER_IMAGE: centos/7
script:
- sudo yum install -y devtoolset-7-gcc\*
- . /opt/rh/devtoolset-7/enable; icinga-build-package
test/centos/7:
<<: *test
......
From 85d847361b519dca524178e3197dbb0ed24e0cb5 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 9 Sep 2016 17:23:27 +0200
Subject: [PATCH 2/2] install redis-check-rdb as a symlink instead of
duplicating the binary
---
src/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 2a68649..585c95b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -307,9 +307,9 @@ install: all
$(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN)
$(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN)
$(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN)
- $(REDIS_INSTALL) $(REDIS_CHECK_RDB_NAME) $(INSTALL_BIN)
- $(REDIS_INSTALL) $(REDIS_CHECK_AOF_NAME) $(INSTALL_BIN)
@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME)
+ @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME)
+ @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME)
uninstall:
rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)}
--
2.20.1
Author: Markus Frosch <markus.frosch@icinga.com>
Date: Wed Nov 20 13:20:51 2019 +0100
Author: Henrik Triem <henrik.triem@icinga.com>
Date: Tue Jun 01 13:20:51 2021 +0100
Change default server port for icinga-redis
diff --git a/redis.conf b/redis.conf
index d74ff98..becbb52 100644
index ab0a30cbd..d8e51f8ba 100644
--- a/redis.conf
+++ b/redis.conf
@@ -89,7 +89,7 @@ protected-mode yes
@@ -95,7 +95,7 @@
# Accept connections on the specified port, default is 6379 (IANA #815344).
# If port 0 is specified Redis will not listen on a TCP socket.
-port 6379
+port 6380
# TCP listen() backlog.
#
@@ -155,7 +155,7 @@ supervised no
@@ -142,7 +142,7 @@
# default port, use:
#
# port 0
-# tls-port 6379
+# tls-port 6380
# Configure a X.509 certificate and private key to use for authenticating the
# server to connected clients, masters or cluster peers. These files should be
@@ -286,7 +286,7 @@
#
# Creating a pid file is best effort: if Redis is not able to create it
# nothing bad happens, the server will start and run normally.
# Note that on modern Linux systems "/run/redis.pid" is more conforming
# and should be used instead.
-pidfile /var/run/redis_6379.pid
+pidfile /var/run/redis_6380.pid
# Specify the server verbosity level.
# This can be one of:
diff --git a/sentinel.conf b/sentinel.conf
index bc9a705..e738713 100644
index b6ff05f25..2d86376fd 100644
--- a/sentinel.conf
+++ b/sentinel.conf
@@ -18,7 +18,7 @@
# port <sentinel-port>
# The port that this sentinel instance will run on
-port 26379
+port 26380
# By default Redis Sentinel does not run as a daemon. Use 'yes' if you need it.
# Note that Redis will write a pid file in /var/run/redis-sentinel.pid when
@@ -81,7 +81,7 @@ dir /tmp
@@ -81,7 +81,7 @@
#
# Note: master name should not include special characters or spaces.
# The valid charset is A-z 0-9 and the three characters ".-_".
......@@ -47,11 +56,24 @@ index bc9a705..e738713 100644
# sentinel auth-pass <master-name> <password>
#
diff --git a/src/config.c b/src/config.c
index 4a956d698..bd3100db6 100644
--- a/src/config.c
+++ b/src/config.c
@@ -2475,7 +2475,7 @@
/* Integer configs */
createIntConfig("databases", NULL, IMMUTABLE_CONFIG, 1, INT_MAX, server.dbnum, 16, INTEGER_CONFIG, NULL, NULL),
- createIntConfig("port", NULL, MODIFIABLE_CONFIG, 0, 65535, server.port, 6379, INTEGER_CONFIG, NULL, updatePort), /* TCP port. */
+ createIntConfig("port", NULL, MODIFIABLE_CONFIG, 0, 65535, server.port, 6380, INTEGER_CONFIG, NULL, updatePort), /* TCP port. */
createIntConfig("io-threads", NULL, IMMUTABLE_CONFIG, 1, 128, server.io_threads_num, 1, INTEGER_CONFIG, NULL, NULL), /* Single threaded by default */
createIntConfig("auto-aof-rewrite-percentage", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.aof_rewrite_perc, 100, INTEGER_CONFIG, NULL, NULL),
createIntConfig("cluster-replica-validity-factor", "cluster-slave-validity-factor", MODIFIABLE_CONFIG, 0, INT_MAX, server.cluster_slave_validity_factor, 10, INTEGER_CONFIG, NULL, NULL), /* Slave max data age factor. */
diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c
index d30879d..fa8d4fe 100644
index 9d9c15e00..ff72dc92b 100644
--- a/src/redis-benchmark.c
+++ b/src/redis-benchmark.c
@@ -567,7 +567,7 @@ usage:
@@ -1555,7 +1555,7 @@
printf(
"Usage: redis-benchmark [-h <host>] [-p <port>] [-c <clients>] [-n <requests>] [-k <boolean>]\n\n"
" -h <hostname> Server hostname (default 127.0.0.1)\n"
......@@ -59,9 +81,27 @@ index d30879d..fa8d4fe 100644
+" -p <port> Server port (default 6380)\n"
" -s <socket> Server socket (overrides host and port)\n"
" -a <password> Password for Redis Auth\n"
" -c <clients> Number of parallel connections (default 50)\n"
@@ -674,7 +674,7 @@ int main(int argc, const char **argv) {
config.latency = NULL;
" --user <username> Used to send ACL style 'AUTH username pass'. Needs -a.\n"
@@ -1605,13 +1605,13 @@
" --help Output this help and exit.\n"
" --version Output version and exit.\n\n"
"Examples:\n\n"
-" Run the benchmark with the default configuration against 127.0.0.1:6379:\n"
+" Run the benchmark with the default configuration against 127.0.0.1:6380:\n"
" $ redis-benchmark\n\n"
" Use 20 parallel clients, for a total of 100k requests, against 192.168.1.1:\n"
-" $ redis-benchmark -h 192.168.1.1 -p 6379 -n 100000 -c 20\n\n"
-" Fill 127.0.0.1:6379 with about 1 million keys only using the SET test:\n"
+" $ redis-benchmark -h 192.168.1.1 -p 6380 -n 100000 -c 20\n\n"
+" Fill 127.0.0.1:6380 with about 1 million keys only using the SET test:\n"
" $ redis-benchmark -t set -n 1000000 -r 100000000\n\n"
-" Benchmark 127.0.0.1:6379 for a few commands producing CSV output:\n"
+" Benchmark 127.0.0.1:6380 for a few commands producing CSV output:\n"
" $ redis-benchmark -t ping,set,get -n 100000 --csv\n\n"
" Benchmark a specific command line:\n"
" $ redis-benchmark -r 10000 -n 10000 eval 'return redis.call(\"ping\")' 0\n\n"
@@ -1707,7 +1707,7 @@
config.idlemode = 0;
config.clients = listCreate();
config.hostip = "127.0.0.1";
- config.hostport = 6379;
......@@ -70,10 +110,10 @@ index d30879d..fa8d4fe 100644
config.tests = NULL;
config.dbnum = 0;
diff --git a/src/redis-cli.c b/src/redis-cli.c
index f9b93e9..f112f1c 100644
index 45a1228e6..3259b0d37 100644
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -1470,7 +1470,7 @@ static void usage(void) {
@@ -1828,7 +1828,7 @@
"\n"
"Usage: redis-cli [OPTIONS] [cmd [arg [arg ...]]]\n"
" -h <hostname> Server hostname (default: 127.0.0.1).\n"
......@@ -82,9 +122,9 @@ index f9b93e9..f112f1c 100644
" -s <socket> Server socket (overrides hostname and port).\n"
" -a <password> Password to use when connecting to the server.\n"
" You can also use the " REDIS_CLI_AUTH_ENV " environment\n"
@@ -6999,7 +6999,7 @@ int main(int argc, char **argv) {
int firstarg;
@@ -8200,7 +8200,7 @@
memset(&config.sslconfig, 0, sizeof(config.sslconfig));
config.hostip = sdsnew("127.0.0.1");
- config.hostport = 6379;
+ config.hostport = 6380;
......@@ -92,23 +132,32 @@ index f9b93e9..f112f1c 100644
config.repeat = 1;
config.interval = 0;
diff --git a/src/sentinel.c b/src/sentinel.c
index adff9d4..368014e 100644
index 1bd82453f..d85ee6049 100644
--- a/src/sentinel.c
+++ b/src/sentinel.c
@@ -40,7 +40,7 @@
extern char **environ;
@@ -49,7 +49,7 @@
extern SSL_CTX *redis_tls_client_ctx;
#endif
-#define REDIS_SENTINEL_PORT 26379
+#define REDIS_SENTINEL_PORT 26380
/* ======================== Sentinel global state =========================== */
diff --git a/src/server.c b/src/server.c
index 7f0acaa..0301801 100644
index 831349a76..34b9eea3f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1645,7 +1645,7 @@ void initServerConfig(void) {
@@ -1479,7 +1479,7 @@
NULL /* allow to expand */
};
-/* Cluster nodes hash table, mapping nodes addresses 1.2.3.4:6379 to
+/* Cluster nodes hash table, mapping nodes addresses 1.2.3.4:6380 to
* clusterNode structures. */
dictType clusterNodesDictType = {
dictSdsHash, /* hash function */
@@ -2687,7 +2687,7 @@
/* Replication related */
server.masterauth = NULL;
server.masterhost = NULL;
......@@ -117,7 +166,7 @@ index 7f0acaa..0301801 100644
server.master = NULL;
server.cached_master = NULL;
server.master_initial_offset = -1;
@@ -3739,7 +3739,7 @@ void usage(void) {
@@ -5590,7 +5590,7 @@
fprintf(stderr," ./redis-server --test-memory <megabytes>\n\n");
fprintf(stderr,"Examples:\n");
fprintf(stderr," ./redis-server (run the server with default conf)\n");
......@@ -125,17 +174,4 @@ index 7f0acaa..0301801 100644
+ fprintf(stderr," ./redis-server /etc/redis/6380.conf\n");
fprintf(stderr," ./redis-server --port 7777\n");
fprintf(stderr," ./redis-server --port 7777 --replicaof 127.0.0.1 8888\n");
fprintf(stderr," ./redis-server /etc/myredis.conf --loglevel verbose\n\n");
diff --git a/src/server.h b/src/server.h
index aa0ec37..70d476e 100644
--- a/src/server.h
+++ b/src/server.h
@@ -83,7 +83,7 @@ typedef long long mstime_t; /* millisecond time type. */
#define CONFIG_MIN_HZ 1
#define CONFIG_MAX_HZ 500
#define MAX_CLIENTS_PER_CLOCK_TICK 200 /* HZ is adapted based on that. */
-#define CONFIG_DEFAULT_SERVER_PORT 6379 /* TCP port. */
+#define CONFIG_DEFAULT_SERVER_PORT 6380 /* TCP port. */
#define CONFIG_DEFAULT_TCP_BACKLOG 511 /* TCP listen backlog. */
#define CONFIG_DEFAULT_CLIENT_TIMEOUT 0 /* Default client timeout: infinite */
#define CONFIG_DEFAULT_DBNUM 16
fprintf(stderr," ./redis-server /etc/myredis.conf --loglevel verbose -\n");
#
# Fedora spec file for redis
#
# License: MIT
......@@ -12,7 +12,7 @@
# Commit IDs for the (unversioned) redis-doc repository
# https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
%global doc_commit 685cc5a4d323203d8e1eb85de3adc47830687207
%global doc_commit 9fe1f36dd716ea982b8917f2bdb70ec4bfc3219b
%global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
# %%{rpmmacrodir} not usable on EL-6
......@@ -23,7 +23,7 @@
%global redis_port 6380
Name: %{?pkg_prefix}redis
Version: 5.0.10
Version: 6.2.4
Release: 1%{?dist}
Summary: A persistent key-value database
# redis, linenoise, lzf, hiredis are BSD
......@@ -34,7 +34,7 @@ Source0: http://download.redis.io/releases/%{src_name}-%{version}.tar.
Source1: %{src_name}.logrotate
Source2: %{src_name}-shutdown
Source3: macros.%{src_name}
# Source4: https://github.com/antirez/%%{src_name}-doc/archive/%%{doc_commit}/%{src_name}-doc-%%{short_doc_commit}.tar.gz
# Source4: https://github.com/%{name}/%{name}-doc/archive/%{doc_commit}/%{name}-doc-%{short_doc_commit}.tar.gz
# To refresh patches:
# tar xf redis-xxx.tar.gz && cd redis-xxx && git init && git add . && git commit -m "%%{version} baseline"
......@@ -42,19 +42,20 @@ Source3: macros.%{src_name}
# Then refresh your patches
# git format-patch HEAD~<number of expected patches>
# Update configuration for Fedora
# https://github.com/antirez/redis/pull/3491 - man pages
# https://github.com/redis/redis/pull/3491 - man pages
Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
# https://github.com/antirez/redis/pull/3494 - symlink
Patch0002: 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
# Update default port from 6370 to 6380
Patch0901: icinga-server-port.patch
BuildRequires: make
BuildRequires: gcc
%if 0%{?with_tests}
BuildRequires: procps-ng
BuildRequires: tcl
%endif
BuildRequires: systemd
BuildRequires: pkgconfig(libsystemd)
BuildRequires: systemd-devel
BuildRequires: openssl-devel
# redis-trib functionality migrated to redis-cli
Obsoletes: redis-trib
# Required for redis-shutdown
......@@ -125,7 +126,6 @@ You can use Redis from most programming languages also.
%setup -q -n %{src_name}-%{version}
# mv ../%%{name}-doc-%%{doc_commit} doc
%patch0001 -p1
%patch0002 -p1
%patch0901 -p1
mv deps/lua/COPYRIGHT COPYRIGHT-lua
......@@ -152,10 +152,10 @@ if test "$api" != "%{redis_modules_abi}"; then
exit 1
fi
%global make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix}
%global make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes
%build
make %{?_smp_mflags} %{make_flags} all
%make_build %{make_flags} all
%install
make %{make_flags} install
......@@ -226,7 +226,7 @@ done
# with a modified Jemalloc like the one shipped by default with the Redis source distribution
sed -e '/memefficiency/d' -i tests/test_helper.tcl
# https://github.com/antirez/redis/issues/1417 (for "taskset -c 1")
# https://github.com/redis/redis/issues/1417 (for "taskset -c 1")
taskset -c 1 make %{make_flags} test
make %{make_flags} test-sentinel
%endif
......@@ -243,6 +243,7 @@ exit 0
%{!?_licensedir:%global license %%doc}
%license COPYING
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%attr(0750, %{name}, root) %dir %{_sysconfdir}/%{name}
%attr(0640, %{name}, root) %config(noreplace) %{_sysconfdir}/%{name}/%{src_name}.conf
# %%attr(0640, %%{name}, root) %%config(noreplace) %%{_sysconfdir}/%%{name}/%%{src_name}-sentinel.conf
%dir %attr(0750, %{name}, %{name}) %{_libdir}/%{name}
......@@ -272,6 +273,15 @@ exit 0
%changelog
* Wed Jun 30 2021 Henrik Triem <henrik.triem@icinga.com> - 6.2.4-1
- Update to 6.2.4
* Mon May 31 2021 Henrik Triem <henrik.triem@icinga.com> - 6.2.3-1
- Update to 6.2.3-1
* Mon Dec 07 2020 Alexander A. Klimov <alexander.klimov@icinga.com> - 6.0.9-1
- Update to 6.0.9
* Fri Nov 13 2020 Alexander A. Klimov <alexander.klimov@icinga.com> - 5.0.10-1
- Update to 5.0.10
......
Supports Markdown
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