Compare commits
11 Commits
Author | SHA1 | Date |
---|---|---|
Nathan Scott | af41e47aa9 | |
Nathan Scott | 6d845630d5 | |
Nathan Scott | d36789d62d | |
Nathan Scott | 5eca1125f3 | |
Silas Sewell | f7cdb67e42 | |
Silas Sewell | 4f19b945ff | |
Silas Sewell | 64242f4507 | |
Silas Sewell | 61d13182bf | |
Silas Sewell | ad07d15a1e | |
Silas Sewell | f67d326480 | |
Silas Sewell | 7dce15eb8d |
|
@ -0,0 +1,48 @@
|
||||||
|
From 2ef9dcc1ae28ace8966621a69c7a9342bde3c183 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nathan Scott <nathans@redhat.com>
|
||||||
|
Date: Tue, 26 Sep 2017 14:42:56 +1000
|
||||||
|
Subject: [PATCH 3/3] backward compatibility for 2.x series config file options
|
||||||
|
|
||||||
|
---
|
||||||
|
src/config.c | 18 ++++++++++++++++++
|
||||||
|
1 file changed, 18 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/config.c b/src/config.c
|
||||||
|
index c1919f2..3bd4374 100644
|
||||||
|
--- a/src/config.c
|
||||||
|
+++ b/src/config.c
|
||||||
|
@@ -451,6 +451,10 @@ void loadServerConfigFromString(char *config) {
|
||||||
|
server.hash_max_ziplist_entries = memtoll(argv[1], NULL);
|
||||||
|
} else if (!strcasecmp(argv[0],"hash-max-ziplist-value") && argc == 2) {
|
||||||
|
server.hash_max_ziplist_value = memtoll(argv[1], NULL);
|
||||||
|
+ } else if (!strcasecmp(argv[0],"hash-max-zipmap-entries") && argc == 2) {
|
||||||
|
+ /* DEAD OPTION */
|
||||||
|
+ } else if (!strcasecmp(argv[0],"hash-max-zipmap-value") && argc == 2) {
|
||||||
|
+ /* DEAD OPTION */
|
||||||
|
} else if (!strcasecmp(argv[0],"list-max-ziplist-entries") && argc == 2){
|
||||||
|
/* DEAD OPTION */
|
||||||
|
} else if (!strcasecmp(argv[0],"list-max-ziplist-value") && argc == 2) {
|
||||||
|
@@ -619,6 +623,20 @@ void loadServerConfigFromString(char *config) {
|
||||||
|
err = sentinelHandleConfiguration(argv+1,argc-1);
|
||||||
|
if (err) goto loaderr;
|
||||||
|
}
|
||||||
|
+ } else if (!strcasecmp(argv[0],"vm-enabled") && argc == 2) {
|
||||||
|
+ /* DEAD OPTION */
|
||||||
|
+ } else if (!strcasecmp(argv[0],"really-use-vm") && argc == 2) {
|
||||||
|
+ /* DEAD OPTION */
|
||||||
|
+ } else if (!strcasecmp(argv[0],"vm-swap-file") && argc == 2) {
|
||||||
|
+ /* DEAD OPTION */
|
||||||
|
+ } else if (!strcasecmp(argv[0],"vm-max-memory") && argc == 2) {
|
||||||
|
+ /* DEAD OPTION */
|
||||||
|
+ } else if (!strcasecmp(argv[0],"vm-page-size") && argc == 2) {
|
||||||
|
+ /* DEAD OPTION */
|
||||||
|
+ } else if (!strcasecmp(argv[0],"vm-pages") && argc == 2) {
|
||||||
|
+ /* DEAD OPTION */
|
||||||
|
+ } else if (!strcasecmp(argv[0],"vm-max-threads") && argc == 2) {
|
||||||
|
+ /* DEAD OPTION */
|
||||||
|
} else {
|
||||||
|
err = "Bad directive or wrong number of arguments"; goto loaderr;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.13.5
|
||||||
|
|
|
@ -0,0 +1,50 @@
|
||||||
|
diff -up redis-2.4.8/redis.conf.orig redis-2.4.8/redis.conf
|
||||||
|
--- redis-2.4.8/redis.conf.orig 2012-02-24 21:59:55.606998781 -0500
|
||||||
|
+++ redis-2.4.8/redis.conf 2012-02-24 22:02:32.598539907 -0500
|
||||||
|
@@ -14,11 +14,11 @@
|
||||||
|
|
||||||
|
# By default Redis does not run as a daemon. Use 'yes' if you need it.
|
||||||
|
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
|
||||||
|
-daemonize no
|
||||||
|
+daemonize yes
|
||||||
|
|
||||||
|
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
|
||||||
|
# default. You can specify a custom pid file location here.
|
||||||
|
-pidfile /var/run/redis.pid
|
||||||
|
+pidfile /var/run/redis/redis.pid
|
||||||
|
|
||||||
|
# Accept connections on the specified port, default is 6379.
|
||||||
|
# If port 0 is specified Redis will not listen on a TCP socket.
|
||||||
|
@@ -27,7 +27,7 @@ port 6379
|
||||||
|
# If you want you can bind a single interface, if the bind option is not
|
||||||
|
# specified all the interfaces will listen for incoming connections.
|
||||||
|
#
|
||||||
|
-# bind 127.0.0.1
|
||||||
|
+bind 127.0.0.1
|
||||||
|
|
||||||
|
# Specify the path for the unix socket that will be used to listen for
|
||||||
|
# incoming connections. There is no default, so Redis will not listen
|
||||||
|
@@ -45,12 +45,12 @@ timeout 0
|
||||||
|
# verbose (many rarely useful info, but not a mess like the debug level)
|
||||||
|
# notice (moderately verbose, what you want in production probably)
|
||||||
|
# warning (only very important / critical messages are logged)
|
||||||
|
-loglevel verbose
|
||||||
|
+loglevel notice
|
||||||
|
|
||||||
|
# Specify the log file name. Also 'stdout' can be used to force
|
||||||
|
# Redis to log on the standard output. Note that if you use standard
|
||||||
|
# output for logging but daemonize, logs will be sent to /dev/null
|
||||||
|
-logfile stdout
|
||||||
|
+logfile /var/log/redis/redis.log
|
||||||
|
|
||||||
|
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
|
||||||
|
# and optionally update the other syslog parameters to suit your needs.
|
||||||
|
@@ -104,7 +104,7 @@ dbfilename dump.rdb
|
||||||
|
# Also the Append Only File will be created inside this directory.
|
||||||
|
#
|
||||||
|
# Note that you must specify a directory here, not a file name.
|
||||||
|
-dir ./
|
||||||
|
+dir /var/lib/redis/
|
||||||
|
|
||||||
|
################################# REPLICATION #################################
|
||||||
|
|
|
@ -80,6 +80,13 @@ case "$1" in
|
||||||
restart)
|
restart)
|
||||||
$1
|
$1
|
||||||
;;
|
;;
|
||||||
|
reload)
|
||||||
|
rh_status_q || exit 7
|
||||||
|
$1
|
||||||
|
;;
|
||||||
|
force-reload)
|
||||||
|
force_reload
|
||||||
|
;;
|
||||||
status)
|
status)
|
||||||
rh_status
|
rh_status
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -41,6 +41,8 @@ Source8: %{name}-limit-init
|
||||||
Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
|
Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
|
||||||
# https://github.com/antirez/redis/pull/3494 - symlink
|
# https://github.com/antirez/redis/pull/3494 - symlink
|
||||||
Patch0002: 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
|
Patch0002: 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
|
||||||
|
# Backwards compatibility for deprecated configuration file options
|
||||||
|
Patch0003: 0003-backward-compatibility-for-2.x-series-config-file-op.patch
|
||||||
%if 0%{?with_perftools}
|
%if 0%{?with_perftools}
|
||||||
BuildRequires: gperftools-devel
|
BuildRequires: gperftools-devel
|
||||||
%else
|
%else
|
||||||
|
@ -115,6 +117,7 @@ and removal, status checks, resharding, rebalancing, and other operations.
|
||||||
rm -frv deps/jemalloc
|
rm -frv deps/jemalloc
|
||||||
%patch0001 -p1
|
%patch0001 -p1
|
||||||
%patch0002 -p1
|
%patch0002 -p1
|
||||||
|
%patch0003 -p1
|
||||||
|
|
||||||
# Use system jemalloc library
|
# Use system jemalloc library
|
||||||
sed -i -e '/cd jemalloc && /d' deps/Makefile
|
sed -i -e '/cd jemalloc && /d' deps/Makefile
|
||||||
|
@ -272,7 +275,7 @@ fi
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Sep 26 2017 Nathan Scott <nathans@redhat.com> - 3.2.11-1
|
* Tue Sep 26 2017 Nathan Scott <nathans@redhat.com> - 3.2.11-1
|
||||||
- Upstream 3.2.11 bug-fix-only release
|
- Upstream 3.2.11 bug-fix-only release
|
||||||
- Switch to using Type=notify for Redis systemd services (RHBZ #1172841)
|
- Back-compatibility for deprecated configuration options (RHBZ #1491728)
|
||||||
- Add Provides:bundled hiredis, linenoise, lua-libs clauses (RHBZ #788500)
|
- Add Provides:bundled hiredis, linenoise, lua-libs clauses (RHBZ #788500)
|
||||||
|
|
||||||
* Mon Aug 14 2017 Nathan Scott <nathans@redhat.com> - 3.2.10-2
|
* Mon Aug 14 2017 Nathan Scott <nathans@redhat.com> - 3.2.10-2
|
||||||
|
|
Loading…
Reference in New Issue