Compare commits
47 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
eb2f5b7b3a | ||
|
24658f1b66 | ||
|
6cae3b1023 | ||
|
a5ee299285 | ||
|
6c3bdb0b63 | ||
|
d75d3d4930 | ||
|
6314fdc7a6 | ||
|
abd5379420 | ||
|
72f15713c3 | ||
|
d23b1d4535 | ||
|
fefcedab2c | ||
|
c5eb5af918 | ||
|
d924812920 | ||
|
91318c4827 | ||
|
0500a44e92 | ||
|
da65cc3c98 | ||
|
25bfce9ab8 | ||
|
ac2422ae25 | ||
|
e35b514eeb | ||
|
59378174a9 | ||
|
df786883ff | ||
|
74836e8db5 | ||
|
c374de3637 | ||
|
9f0877ed49 | ||
|
dc361d6b75 | ||
|
5085a9081d | ||
|
64e67eb9fe | ||
|
16aeff4dbc | ||
|
cf49c6bbe9 | ||
|
668ece2ae9 | ||
|
aa0c5b2abf | ||
|
94b0494e4a | ||
|
4f1d5f156d | ||
|
4e3af4a0d8 | ||
|
dfbfda99c9 | ||
|
0641733c28 | ||
|
03b3484b7d | ||
|
bf304417be | ||
|
8cbea8c9c3 | ||
|
93650f449c | ||
|
fc3bfb53c4 | ||
|
b9162a4476 | ||
|
1968d3b557 | ||
|
5595a23796 | ||
|
83364f086c | ||
|
d66975ecc1 | ||
|
6844759f70 |
17
.gitignore
vendored
17
.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
|
clog
|
||||||
/redis-2.0.3.tar.gz
|
/redis-2.0.3.tar.gz
|
||||||
/redis-2.0.4.tar.gz
|
/redis-2.0.4.tar.gz
|
||||||
/redis-2.2.2.tar.gz
|
/redis-2.2.2.tar.gz
|
||||||
@ -28,3 +29,19 @@
|
|||||||
/redis-3.0.5.tar.gz
|
/redis-3.0.5.tar.gz
|
||||||
/redis-3.0.6.tar.gz
|
/redis-3.0.6.tar.gz
|
||||||
/redis-3.2.3.tar.gz
|
/redis-3.2.3.tar.gz
|
||||||
|
/redis-3.2.4.tar.gz
|
||||||
|
/redis-3.2.7.tar.gz
|
||||||
|
/redis-3.2.8.tar.gz
|
||||||
|
/redis-3.2.9.tar.gz
|
||||||
|
/redis-3.2.10.tar.gz
|
||||||
|
/redis-3.2.11.tar.gz
|
||||||
|
/redis-4.0.2.tar.gz
|
||||||
|
/redis-doc-69a5512.tar.gz
|
||||||
|
/redis-4.0.4.tar.gz
|
||||||
|
/redis-doc-dc402c6.tar.gz
|
||||||
|
/redis-4.0.5.tar.gz
|
||||||
|
/redis-4.0.6.tar.gz
|
||||||
|
/redis-4.0.7.tar.gz
|
||||||
|
/redis-doc-38c2bd6.tar.gz
|
||||||
|
/redis-4.0.8.tar.gz
|
||||||
|
/redis-4.0.9.tar.gz
|
||||||
|
652
0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
Normal file
652
0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
Normal file
@ -0,0 +1,652 @@
|
|||||||
|
From c7958ad1c0d615b81276ec2d4dbc1bf6a67dcc4d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Remi Collet <fedora@famillecollet.com>
|
||||||
|
Date: Thu, 8 Sep 2016 14:51:15 +0200
|
||||||
|
Subject: [PATCH 1/2] 1st man pageis for - redis-cli - redis-benchmark -
|
||||||
|
redis-check-aof - redis-check-rdb - redis-server - redis.conf
|
||||||
|
|
||||||
|
as redis-sentinel is a symlink to redis-server, same page can be used (also symlinked)
|
||||||
|
redis.conf can also be used for sentinel.conf
|
||||||
|
---
|
||||||
|
man/man1/redis-benchmark.1 | 132 ++++++++++++++++++++++++++++++++++
|
||||||
|
man/man1/redis-check-aof.1 | 60 ++++++++++++++++
|
||||||
|
man/man1/redis-check-rdb.1 | 53 ++++++++++++++
|
||||||
|
man/man1/redis-cli.1 | 171 +++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
man/man1/redis-server.1 | 117 +++++++++++++++++++++++++++++++
|
||||||
|
man/man5/redis.conf.5 | 57 +++++++++++++++
|
||||||
|
6 files changed, 590 insertions(+)
|
||||||
|
create mode 100644 man/man1/redis-benchmark.1
|
||||||
|
create mode 100644 man/man1/redis-check-aof.1
|
||||||
|
create mode 100644 man/man1/redis-check-rdb.1
|
||||||
|
create mode 100644 man/man1/redis-cli.1
|
||||||
|
create mode 100644 man/man1/redis-server.1
|
||||||
|
create mode 100644 man/man5/redis.conf.5
|
||||||
|
|
||||||
|
diff --git a/man/man1/redis-benchmark.1 b/man/man1/redis-benchmark.1
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..a3e4c62
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/man/man1/redis-benchmark.1
|
||||||
|
@@ -0,0 +1,132 @@
|
||||||
|
+.TH REDIS-BENCHMARK 1 "2016" "Redis" "User commands"
|
||||||
|
+.SH NAME
|
||||||
|
+redis\-benchmark \- Redis benchmark
|
||||||
|
+
|
||||||
|
+.SH SYNOPSIS
|
||||||
|
+.B redis\-benchmark
|
||||||
|
+[ options ]
|
||||||
|
+.LP
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+\fBRedis\fP is an open source (BSD licensed), in-memory data structure store,
|
||||||
|
+used as database, cache and message broker, found at
|
||||||
|
+.B http://redis.io/
|
||||||
|
+
|
||||||
|
+The \fBredis\-benchmark\fP command is a command to benchmark redis-server.
|
||||||
|
+
|
||||||
|
+.SH OPTIONS
|
||||||
|
+.TP 15
|
||||||
|
+.B \-h \fIhostname\fP
|
||||||
|
+Server hostname (default: 127.0.0.1).
|
||||||
|
+.TP
|
||||||
|
+.B \-p \fIport\fP
|
||||||
|
+Server port (default: 6379).
|
||||||
|
+.TP
|
||||||
|
+.B \-s \fIsocket\fP
|
||||||
|
+Server socket (overrides hostname and port).
|
||||||
|
+.TP
|
||||||
|
+.B \-a \fIpassword\fP
|
||||||
|
+Password to use when connecting to the server.
|
||||||
|
+.TP
|
||||||
|
+.B \-c \fIclients\fP
|
||||||
|
+Number of parallel connections (default 50)
|
||||||
|
+.TP
|
||||||
|
+.B \-dnnum \fIdb\fP
|
||||||
|
+SELECT the specified db number (default 0)
|
||||||
|
+.TP
|
||||||
|
+.B \-k \fIboolean\fP
|
||||||
|
+1=keep alive 0=reconnect (default 1)
|
||||||
|
+.TP
|
||||||
|
+.B \-r \fIkeyspacelen\fP
|
||||||
|
+Use random keys for SET/GET/INCR, random values for SADD
|
||||||
|
+Using this option the benchmark will expand the string __rand_int__
|
||||||
|
+inside an argument with a 12 digits number in the specified range
|
||||||
|
+from 0 to keyspacelen-1. The substitution changes every time a command
|
||||||
|
+is executed. Default tests use this to hit random keys in the
|
||||||
|
+specified range.
|
||||||
|
+.TP
|
||||||
|
+.B \-P \fInumreq\fP
|
||||||
|
+Pipeline <numreq> requests. Default 1 (no pipeline).
|
||||||
|
+.TP
|
||||||
|
+.B \-e
|
||||||
|
+If server replies with errors, show them on stdout.
|
||||||
|
+(no more than 1 error per second is displayed)
|
||||||
|
+.TP
|
||||||
|
+.B \-q
|
||||||
|
+Quiet. Just show query/sec values
|
||||||
|
+.TP
|
||||||
|
+.B \-\-csv
|
||||||
|
+Output in CSV format
|
||||||
|
+.TP
|
||||||
|
+.B \-l
|
||||||
|
+Loop. Run the tests forever
|
||||||
|
+.TP
|
||||||
|
+.B \-t \fItests\fP
|
||||||
|
+Only run the comma separated list of tests. The test
|
||||||
|
+names are the same as the ones produced as output.
|
||||||
|
+.TP
|
||||||
|
+.B \-I
|
||||||
|
+Idle mode. Just open N idle connections and wait.
|
||||||
|
+
|
||||||
|
+.SH EXAMPLES
|
||||||
|
+.TP 5
|
||||||
|
+Run the benchmark with the default configuration against 127.0.0.1:6379:
|
||||||
|
+$ redis\-benchmark
|
||||||
|
+.TP
|
||||||
|
+Use 20 parallel clients, for a total of 100k requests, against 192.168.1.1:
|
||||||
|
+$ redis-benchmark \-h 192.168.1.1 \-p 6379 \-n 100000 \-c 20
|
||||||
|
+.TP
|
||||||
|
+Fill 127.0.0.1:6379 with about 1 million keys only using the SET test:
|
||||||
|
+$ redis\-benchmark \-t set \-n 1000000 \-r 100000000
|
||||||
|
+.TP
|
||||||
|
+Benchmark 127.0.0.1:6379 for a few commands producing CSV output:
|
||||||
|
+$ redis\-benchmark \-t ping,set,get \-n 100000 \-\-csv
|
||||||
|
+.TP
|
||||||
|
+Benchmark a specific command line:
|
||||||
|
+$ redis\-benchmark \-r 10000 \-n 10000 eval 'return redis.call("ping")' 0
|
||||||
|
+.TP
|
||||||
|
+Fill a list with 10000 random elements:
|
||||||
|
+$ redis\-benchmark \-r 10000 \-n 10000 lpush mylist __rand_int__
|
||||||
|
+.TP
|
||||||
|
+On user specified command lines __rand_int__ is replaced with a random integer
|
||||||
|
+with a range of values selected by the -r option.
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+.SH BUGS
|
||||||
|
+See:
|
||||||
|
+.PD 0
|
||||||
|
+.B http://redis.io/support
|
||||||
|
+and
|
||||||
|
+.B https://github.com/antirez/redis/issues
|
||||||
|
+
|
||||||
|
+.SH COPYRIGHT
|
||||||
|
+Copyright \(co 2006\-2016
|
||||||
|
+Salvatore Sanfilippo
|
||||||
|
+.P
|
||||||
|
+Redistribution and use in source and binary forms, with or without
|
||||||
|
+modification, are permitted provided that the following conditions are met:
|
||||||
|
+.TP 2
|
||||||
|
+*
|
||||||
|
+Redistributions of source code must retain the above copyright notice,
|
||||||
|
+this list of conditions and the following disclaimer.
|
||||||
|
+.TP
|
||||||
|
+*
|
||||||
|
+Redistributions in binary form must reproduce the above copyright
|
||||||
|
+notice, this list of conditions and the following disclaimer in the
|
||||||
|
+documentation and/or other materials provided with the distribution.
|
||||||
|
+.TP
|
||||||
|
+*
|
||||||
|
+Neither the name of Redis nor the names of its contributors may be used
|
||||||
|
+to endorse or promote products derived from this software without specific
|
||||||
|
+prior written permission.
|
||||||
|
+.P
|
||||||
|
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
diff --git a/man/man1/redis-check-aof.1 b/man/man1/redis-check-aof.1
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..1569fd9
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/man/man1/redis-check-aof.1
|
||||||
|
@@ -0,0 +1,60 @@
|
||||||
|
+.TH REDIS-CHECK-AOF 1 "2016" "Redis" "User commands"
|
||||||
|
+.SH NAME
|
||||||
|
+redis\-check\-aof \- Redis AOF file checker and repairer
|
||||||
|
+
|
||||||
|
+.SH SYNOPSIS
|
||||||
|
+.B redis\-check\-aof
|
||||||
|
+[\-\-fix]
|
||||||
|
+.IR file.aof
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+\fBRedis\fP is an open source (BSD licensed), in-memory data structure store,
|
||||||
|
+used as database, cache and message broker, found at
|
||||||
|
+.B http://redis.io/
|
||||||
|
+
|
||||||
|
+The \fBredis\-check\-aof\fP command to check or repair redis-server AOF files.
|
||||||
|
+
|
||||||
|
+.SH OPTIONS
|
||||||
|
+.TP 15
|
||||||
|
+.B \-\-fix
|
||||||
|
+Fix the file
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+.SH BUGS
|
||||||
|
+See:
|
||||||
|
+.PD 0
|
||||||
|
+.B http://redis.io/support
|
||||||
|
+and
|
||||||
|
+.B https://github.com/antirez/redis/issues
|
||||||
|
+
|
||||||
|
+.SH COPYRIGHT
|
||||||
|
+Copyright \(co 2006\-2016
|
||||||
|
+Salvatore Sanfilippo
|
||||||
|
+.P
|
||||||
|
+Redistribution and use in source and binary forms, with or without
|
||||||
|
+modification, are permitted provided that the following conditions are met:
|
||||||
|
+.TP 2
|
||||||
|
+*
|
||||||
|
+Redistributions of source code must retain the above copyright notice,
|
||||||
|
+this list of conditions and the following disclaimer.
|
||||||
|
+.TP
|
||||||
|
+*
|
||||||
|
+Redistributions in binary form must reproduce the above copyright
|
||||||
|
+notice, this list of conditions and the following disclaimer in the
|
||||||
|
+documentation and/or other materials provided with the distribution.
|
||||||
|
+.TP
|
||||||
|
+*
|
||||||
|
+Neither the name of Redis nor the names of its contributors may be used
|
||||||
|
+to endorse or promote products derived from this software without specific
|
||||||
|
+prior written permission.
|
||||||
|
+.P
|
||||||
|
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
diff --git a/man/man1/redis-check-rdb.1 b/man/man1/redis-check-rdb.1
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..0e798ab
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/man/man1/redis-check-rdb.1
|
||||||
|
@@ -0,0 +1,53 @@
|
||||||
|
+.TH REDIS-CHECK-RDB 1 "2016" "Redis" "User commands"
|
||||||
|
+.SH NAME
|
||||||
|
+redis\-check\-aof \- Redis RDB file checker
|
||||||
|
+
|
||||||
|
+.SH SYNOPSIS
|
||||||
|
+.B redis\-check\-aof
|
||||||
|
+.IR file.rdb
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+\fBRedis\fP is an open source (BSD licensed), in-memory data structure store,
|
||||||
|
+used as database, cache and message broker, found at
|
||||||
|
+.B http://redis.io/
|
||||||
|
+
|
||||||
|
+The \fBredis\-check\-rdb\fP command to check redis-server RDB files.
|
||||||
|
+
|
||||||
|
+.SH BUGS
|
||||||
|
+See:
|
||||||
|
+.PD 0
|
||||||
|
+.B http://redis.io/support
|
||||||
|
+and
|
||||||
|
+.B https://github.com/antirez/redis/issues
|
||||||
|
+
|
||||||
|
+.SH COPYRIGHT
|
||||||
|
+Copyright \(co 2006\-2016
|
||||||
|
+Salvatore Sanfilippo
|
||||||
|
+.P
|
||||||
|
+Redistribution and use in source and binary forms, with or without
|
||||||
|
+modification, are permitted provided that the following conditions are met:
|
||||||
|
+.TP 2
|
||||||
|
+*
|
||||||
|
+Redistributions of source code must retain the above copyright notice,
|
||||||
|
+this list of conditions and the following disclaimer.
|
||||||
|
+.TP
|
||||||
|
+*
|
||||||
|
+Redistributions in binary form must reproduce the above copyright
|
||||||
|
+notice, this list of conditions and the following disclaimer in the
|
||||||
|
+documentation and/or other materials provided with the distribution.
|
||||||
|
+.TP
|
||||||
|
+*
|
||||||
|
+Neither the name of Redis nor the names of its contributors may be used
|
||||||
|
+to endorse or promote products derived from this software without specific
|
||||||
|
+prior written permission.
|
||||||
|
+.P
|
||||||
|
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
diff --git a/man/man1/redis-cli.1 b/man/man1/redis-cli.1
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..14f84df
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/man/man1/redis-cli.1
|
||||||
|
@@ -0,0 +1,171 @@
|
||||||
|
+.TH REDIS-CLI 1 "2016" "Redis" "User commands"
|
||||||
|
+.SH NAME
|
||||||
|
+redis\-cli \- Redis client
|
||||||
|
+
|
||||||
|
+.SH SYNOPSIS
|
||||||
|
+.B redis\-cli
|
||||||
|
+[ options ] [cmd [arg [arg ...]]]
|
||||||
|
+.LP
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+\fBRedis\fP is an open source (BSD licensed), in-memory data structure store,
|
||||||
|
+used as database, cache and message broker, found at
|
||||||
|
+.B http://redis.io/
|
||||||
|
+
|
||||||
|
+The \fBredis-cli\fP command is a command line client to redis-server.
|
||||||
|
+
|
||||||
|
+.SH OPTIONS
|
||||||
|
+.TP 15
|
||||||
|
+.B \-h \fIhostname\fP
|
||||||
|
+Server hostname (default: 127.0.0.1).
|
||||||
|
+.TP
|
||||||
|
+.B \-p \fIport\fP
|
||||||
|
+Server port (default: 6379).
|
||||||
|
+.TP
|
||||||
|
+.B \-s \fIsocket\fP
|
||||||
|
+Server socket (overrides hostname and port).
|
||||||
|
+.TP
|
||||||
|
+.B \-a \fIpassword\fP
|
||||||
|
+Password to use when connecting to the server.
|
||||||
|
+.TP
|
||||||
|
+.B \-r \fIrepeat\fP
|
||||||
|
+Execute specified command N times.
|
||||||
|
+.TP
|
||||||
|
+.B \-i \fIinterval\fP
|
||||||
|
+When -r is used, waits \fIinterval\fP seconds per command.
|
||||||
|
+It is possible to specify sub-second times like -i 0.1.
|
||||||
|
+.TP
|
||||||
|
+.B \-n \fIdb\fP
|
||||||
|
+Database number.
|
||||||
|
+.TP
|
||||||
|
+.B \-x
|
||||||
|
+Read last argument from STDIN.
|
||||||
|
+.TP
|
||||||
|
+.B \-d \fIdelimiter\fP
|
||||||
|
+Multi-bulk delimiter in for raw formatting (default: \n).
|
||||||
|
+.TP
|
||||||
|
+.B \-c
|
||||||
|
+Enable cluster mode (follow -ASK and -MOVED redirections).
|
||||||
|
+.TP
|
||||||
|
+.B \-\-raw
|
||||||
|
+Use raw formatting for replies (default when STDOUT is not a tty).
|
||||||
|
+.TP
|
||||||
|
+.B \-\-no\-raw
|
||||||
|
+Force formatted output even when STDOUT is not a tty.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-csv
|
||||||
|
+Output in CSV format.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-stat
|
||||||
|
+Print rolling stats about server: mem, clients, ...
|
||||||
|
+.TP
|
||||||
|
+.B \-\-latency
|
||||||
|
+Enter a special mode continuously sampling latency.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-latency\-history
|
||||||
|
+Like \-\-latency but tracking latency changes over time.
|
||||||
|
+Default time interval is 15 sec. Change it using -i.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-latency\-dist
|
||||||
|
+Shows latency as a spectrum, requires xterm 256 colors.
|
||||||
|
+Default time interval is 1 sec. Change it using -i.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-lru\-test
|
||||||
|
+Simulate a cache workload with an 80-20 distribution.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-slave
|
||||||
|
+Simulate a slave showing commands received from the master.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-rdb \fIfilename\fP
|
||||||
|
+Transfer an RDB dump from remote server to local file.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-pipe
|
||||||
|
+Transfer raw Redis protocol from stdin to server.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-pipe-timeout \fIn\fP
|
||||||
|
+In --pipe mode, abort with error if after sending all data.
|
||||||
|
+no reply is received within \fIn\fP seconds.
|
||||||
|
+Default timeout: 30. Use 0 to wait forever.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-bigkeys
|
||||||
|
+Sample Redis keys looking for big keys.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-scan
|
||||||
|
+List all keys using the SCAN command.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-pattern \fIpat\fP
|
||||||
|
+Useful with --scan to specify a SCAN pattern.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-intrinsic-latency \fIsec\fP
|
||||||
|
+Run a test to measure intrinsic system latency.
|
||||||
|
+The test will run for the specified amount of seconds.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-eval \fIfile\fP
|
||||||
|
+Send an EVAL command using the Lua script at \fIfile\fP.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-ldb
|
||||||
|
+Used with --eval enable the Redis Lua debugger.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-ldb-sync-mode
|
||||||
|
+Like --ldb but uses the synchronous Lua debugger, in
|
||||||
|
+this mode the server is blocked and script changes are
|
||||||
|
+are not rolled back from the server memory.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-help
|
||||||
|
+Output this help and exit.
|
||||||
|
+.TP
|
||||||
|
+.B \-\-version
|
||||||
|
+Output version and exit.
|
||||||
|
+
|
||||||
|
+.SH EXAMPLES
|
||||||
|
+.TP
|
||||||
|
+cat /etc/passwd | redis-cli -x set mypasswd
|
||||||
|
+.TP
|
||||||
|
+redis-cli get mypasswd
|
||||||
|
+.TP
|
||||||
|
+redis-cli \-r 100 lpush mylist x
|
||||||
|
+.TP
|
||||||
|
+redis-cli \-r 100 \-i 1 info | grep used_memory_human:
|
||||||
|
+.TP
|
||||||
|
+redis-cli \-\-eval myscript.lua key1 key2 , arg1 arg2 arg3
|
||||||
|
+.TP
|
||||||
|
+redis-cli \-\-scan \-\-pattern '*:12345*'
|
||||||
|
+
|
||||||
|
+.SH BUGS
|
||||||
|
+See:
|
||||||
|
+.PD 0
|
||||||
|
+.B http://redis.io/support
|
||||||
|
+and
|
||||||
|
+.B https://github.com/antirez/redis/issues
|
||||||
|
+
|
||||||
|
+.SH COPYRIGHT
|
||||||
|
+Copyright \(co 2006\-2016
|
||||||
|
+Salvatore Sanfilippo
|
||||||
|
+.P
|
||||||
|
+Redistribution and use in source and binary forms, with or without
|
||||||
|
+modification, are permitted provided that the following conditions are met:
|
||||||
|
+.TP 2
|
||||||
|
+*
|
||||||
|
+Redistributions of source code must retain the above copyright notice,
|
||||||
|
+this list of conditions and the following disclaimer.
|
||||||
|
+.TP
|
||||||
|
+*
|
||||||
|
+Redistributions in binary form must reproduce the above copyright
|
||||||
|
+notice, this list of conditions and the following disclaimer in the
|
||||||
|
+documentation and/or other materials provided with the distribution.
|
||||||
|
+.TP
|
||||||
|
+*
|
||||||
|
+Neither the name of Redis nor the names of its contributors may be used
|
||||||
|
+to endorse or promote products derived from this software without specific
|
||||||
|
+prior written permission.
|
||||||
|
+.P
|
||||||
|
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
diff --git a/man/man1/redis-server.1 b/man/man1/redis-server.1
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..d6edd25
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/man/man1/redis-server.1
|
||||||
|
@@ -0,0 +1,117 @@
|
||||||
|
+.TH REDIS-SERVER 1 "2016" "Redis" "User commands"
|
||||||
|
+.SH NAME
|
||||||
|
+redis\-server, redis\-sentinel \- Redis server
|
||||||
|
+
|
||||||
|
+.SH SYNOPSIS
|
||||||
|
+.B redis\-server
|
||||||
|
+[
|
||||||
|
+.IR configuration_file
|
||||||
|
+] [ options ] [ \-\-sentinel ]
|
||||||
|
+.LP
|
||||||
|
+.B redis\-sentinel
|
||||||
|
+[
|
||||||
|
+.IR configuration_file
|
||||||
|
+] [ options ]
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+\fBRedis\fP is an open source (BSD licensed), in-memory data structure store,
|
||||||
|
+used as database, cache and message broker, found at
|
||||||
|
+.B http://redis.io/
|
||||||
|
+.LP
|
||||||
|
+The \fBredis\-server\fP command is a command line to launch a Redis server.
|
||||||
|
+.LP
|
||||||
|
+The \fBredis\-sentinel\fP command is a symbolic link to the \fBredis\-server\fP
|
||||||
|
+command which imply the \fB\-\-sentionel\fP option.
|
||||||
|
+
|
||||||
|
+.SH OPTIONS
|
||||||
|
+.TP 15
|
||||||
|
+.B \-
|
||||||
|
+Read configuration from stdin.
|
||||||
|
+.TP
|
||||||
|
+.TP 15
|
||||||
|
+.B \-\-sentinel
|
||||||
|
+Run in sentinel mode
|
||||||
|
+.TP
|
||||||
|
+.B \-\-test-memory \fImegabytes\fP
|
||||||
|
+Run a memory check and exit.
|
||||||
|
+.TP
|
||||||
|
+.PD 0
|
||||||
|
+.B \-\-help
|
||||||
|
+.TP
|
||||||
|
+.PD 1
|
||||||
|
+.B \-h
|
||||||
|
+Output this help and exit.
|
||||||
|
+.TP
|
||||||
|
+.PD 0
|
||||||
|
+.B \-\-version
|
||||||
|
+.TP
|
||||||
|
+.PD 1
|
||||||
|
+.B \-v
|
||||||
|
+Output version and exit.
|
||||||
|
+.P
|
||||||
|
+All parameters described in \fBredis.conf\fR file can be passed as
|
||||||
|
+command line option, e.g.
|
||||||
|
+.B \-\-port
|
||||||
|
+.IR port
|
||||||
|
+.
|
||||||
|
+
|
||||||
|
+.SH EXAMPLES
|
||||||
|
+.TP 5
|
||||||
|
+Run the server with default conf
|
||||||
|
+redis-server
|
||||||
|
+.TP
|
||||||
|
+Run the server with a configuration file
|
||||||
|
+redis-server /etc/redis/6379.conf
|
||||||
|
+.TP
|
||||||
|
+Run the server changing some default options
|
||||||
|
+redis-server --port 7777 --slaveof 127.0.0.1 8888
|
||||||
|
+.TP
|
||||||
|
+Run the server with a configuration file and changing some options
|
||||||
|
+redis-server /etc/myredis.conf --loglevel verbose
|
||||||
|
+.TP
|
||||||
|
+Run in sentinel mode
|
||||||
|
+redis-server /etc/sentinel.conf --sentinel
|
||||||
|
+
|
||||||
|
+.SH "SEE ALSO"
|
||||||
|
+.PP
|
||||||
|
+\fBredis.conf\fR(5)
|
||||||
|
+
|
||||||
|
+.SH BUGS
|
||||||
|
+See:
|
||||||
|
+.PD 0
|
||||||
|
+.B http://redis.io/support
|
||||||
|
+and
|
||||||
|
+.B https://github.com/antirez/redis/issues
|
||||||
|
+
|
||||||
|
+.SH COPYRIGHT
|
||||||
|
+Copyright \(co 2006\-2016
|
||||||
|
+Salvatore Sanfilippo
|
||||||
|
+.P
|
||||||
|
+Redistribution and use in source and binary forms, with or without
|
||||||
|
+modification, are permitted provided that the following conditions are met:
|
||||||
|
+.TP 2
|
||||||
|
+*
|
||||||
|
+Redistributions of source code must retain the above copyright notice,
|
||||||
|
+this list of conditions and the following disclaimer.
|
||||||
|
+.TP
|
||||||
|
+*
|
||||||
|
+Redistributions in binary form must reproduce the above copyright
|
||||||
|
+notice, this list of conditions and the following disclaimer in the
|
||||||
|
+documentation and/or other materials provided with the distribution.
|
||||||
|
+.TP
|
||||||
|
+*
|
||||||
|
+Neither the name of Redis nor the names of its contributors may be used
|
||||||
|
+to endorse or promote products derived from this software without specific
|
||||||
|
+prior written permission.
|
||||||
|
+.P
|
||||||
|
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
diff --git a/man/man5/redis.conf.5 b/man/man5/redis.conf.5
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..1e0c9c9
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/man/man5/redis.conf.5
|
||||||
|
@@ -0,0 +1,57 @@
|
||||||
|
+.TH REDIS.CONF 5 "2016" "Redis" "Configuration files"
|
||||||
|
+.SH NAME
|
||||||
|
+redis.conf, sentinel.conf - redis server configuration files.
|
||||||
|
+
|
||||||
|
+.SH PARAMETERS
|
||||||
|
+.TP
|
||||||
|
+All empty lines or lines beginning with '#' are ignored.
|
||||||
|
+.TP
|
||||||
|
+See inline comments for parameters description.
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+.TP
|
||||||
|
+\fBredis-server\fP read the configuration file passed as first argument.
|
||||||
|
+
|
||||||
|
+.SH "SEE ALSO"
|
||||||
|
+.PP
|
||||||
|
+\fBredis\-server\fR(1)
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+.SH BUGS
|
||||||
|
+See:
|
||||||
|
+.PD 0
|
||||||
|
+.B http://redis.io/support
|
||||||
|
+and
|
||||||
|
+.B https://github.com/antirez/redis/issues
|
||||||
|
+
|
||||||
|
+.SH COPYRIGHT
|
||||||
|
+Copyright \(co 2006\-2016
|
||||||
|
+Salvatore Sanfilippo
|
||||||
|
+.P
|
||||||
|
+Redistribution and use in source and binary forms, with or without
|
||||||
|
+modification, are permitted provided that the following conditions are met:
|
||||||
|
+.TP 2
|
||||||
|
+*
|
||||||
|
+Redistributions of source code must retain the above copyright notice,
|
||||||
|
+this list of conditions and the following disclaimer.
|
||||||
|
+.TP
|
||||||
|
+*
|
||||||
|
+Redistributions in binary form must reproduce the above copyright
|
||||||
|
+notice, this list of conditions and the following disclaimer in the
|
||||||
|
+documentation and/or other materials provided with the distribution.
|
||||||
|
+.TP
|
||||||
|
+*
|
||||||
|
+Neither the name of Redis nor the names of its contributors may be used
|
||||||
|
+to endorse or promote products derived from this software without specific
|
||||||
|
+prior written permission.
|
||||||
|
+.P
|
||||||
|
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
--
|
||||||
|
2.13.5
|
||||||
|
|
@ -1,43 +0,0 @@
|
|||||||
From 2875336337c14d15878fcc36de83cea350fc47f1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
|
|
||||||
Date: Fri, 5 Dec 2014 14:11:15 +0100
|
|
||||||
Subject: [PATCH 1/5] redis 3.2.3: redis conf
|
|
||||||
|
|
||||||
---
|
|
||||||
redis.conf | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/redis.conf b/redis.conf
|
|
||||||
index 22e00bc..46a0154 100644
|
|
||||||
--- a/redis.conf
|
|
||||||
+++ b/redis.conf
|
|
||||||
@@ -147,7 +147,7 @@ supervised no
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
-pidfile /var/run/redis_6379.pid
|
|
||||||
+pidfile /var/run/redis/redis.pid
|
|
||||||
|
|
||||||
# Specify the server verbosity level.
|
|
||||||
# This can be one of:
|
|
||||||
@@ -160,7 +160,7 @@ loglevel notice
|
|
||||||
# Specify the log file name. Also the empty string 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 ""
|
|
||||||
+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.
|
|
||||||
@@ -244,7 +244,7 @@ dbfilename dump.rdb
|
|
||||||
# The Append Only File will also be created inside this directory.
|
|
||||||
#
|
|
||||||
# Note that you must specify a directory here, not a file name.
|
|
||||||
-dir ./
|
|
||||||
+dir /var/lib/redis
|
|
||||||
|
|
||||||
################################# REPLICATION #################################
|
|
||||||
|
|
||||||
--
|
|
||||||
2.9.0
|
|
||||||
|
|
@ -0,0 +1,26 @@
|
|||||||
|
From 992c773e70462a6fbe1536e18e673c9ab55d5901 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 fdbe36a..c3083f8 100644
|
||||||
|
--- a/src/Makefile
|
||||||
|
+++ b/src/Makefile
|
||||||
|
@@ -287,6 +287,6 @@ 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)
|
||||||
|
--
|
||||||
|
2.13.5
|
||||||
|
|
@ -1,53 +0,0 @@
|
|||||||
From 0a7d1df14b256dc77249f8d5d0d483b1b4a6c97d Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
|
|
||||||
Date: Mon, 8 Dec 2014 10:02:54 +0100
|
|
||||||
Subject: [PATCH 2/5] redis 3.2.3: deps library fPIC performance tuning
|
|
||||||
|
|
||||||
---
|
|
||||||
deps/Makefile | 2 +-
|
|
||||||
deps/geohash-int/Makefile | 2 +-
|
|
||||||
deps/linenoise/Makefile | 2 +-
|
|
||||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/deps/Makefile b/deps/Makefile
|
|
||||||
index 1c10bce..14839de 100644
|
|
||||||
--- a/deps/Makefile
|
|
||||||
+++ b/deps/Makefile
|
|
||||||
@@ -59,7 +59,7 @@ ifeq ($(uname_S),SunOS)
|
|
||||||
LUA_CFLAGS= -D__C99FEATURES__=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS)
|
|
||||||
+LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) -fPIC
|
|
||||||
LUA_LDFLAGS+= $(LDFLAGS)
|
|
||||||
# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
|
|
||||||
# challenging to cross-compile lua (and redis). These defines make it easier
|
|
||||||
diff --git a/deps/geohash-int/Makefile b/deps/geohash-int/Makefile
|
|
||||||
index b7c2595..d8b5b40 100644
|
|
||||||
--- a/deps/geohash-int/Makefile
|
|
||||||
+++ b/deps/geohash-int/Makefile
|
|
||||||
@@ -2,7 +2,7 @@ STD=
|
|
||||||
WARN= -Wall
|
|
||||||
OPT= -O2
|
|
||||||
|
|
||||||
-R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
|
|
||||||
+R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -fPIC
|
|
||||||
R_LDFLAGS= $(LDFLAGS)
|
|
||||||
DEBUG= -g
|
|
||||||
|
|
||||||
diff --git a/deps/linenoise/Makefile b/deps/linenoise/Makefile
|
|
||||||
index 1dd894b..712f2a6 100644
|
|
||||||
--- a/deps/linenoise/Makefile
|
|
||||||
+++ b/deps/linenoise/Makefile
|
|
||||||
@@ -2,7 +2,7 @@ STD=
|
|
||||||
WARN= -Wall
|
|
||||||
OPT= -Os
|
|
||||||
|
|
||||||
-R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
|
|
||||||
+R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -fPIC
|
|
||||||
R_LDFLAGS= $(LDFLAGS)
|
|
||||||
DEBUG= -g
|
|
||||||
|
|
||||||
--
|
|
||||||
2.9.0
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
|||||||
From 16501b1430c43d66736ea5530cd68b571af809f2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
|
|
||||||
Date: Mon, 8 Dec 2014 10:03:40 +0100
|
|
||||||
Subject: [PATCH 3/5] redis 2.8.18: use system jemalloc
|
|
||||||
|
|
||||||
---
|
|
||||||
src/Makefile | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/Makefile b/src/Makefile
|
|
||||||
index 648127a..d513859 100644
|
|
||||||
--- a/src/Makefile
|
|
||||||
+++ b/src/Makefile
|
|
||||||
@@ -94,8 +94,8 @@ endif
|
|
||||||
|
|
||||||
ifeq ($(MALLOC),jemalloc)
|
|
||||||
DEPENDENCY_TARGETS+= jemalloc
|
|
||||||
- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
|
|
||||||
- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
|
|
||||||
+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
|
|
||||||
+ FINAL_LIBS+= -ljemalloc -ldl
|
|
||||||
endif
|
|
||||||
|
|
||||||
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
|
|
||||||
--
|
|
||||||
2.9.0
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
|||||||
From 851ea8154a2a8e974d1588be3d6d38262ca2ae33 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
|
|
||||||
Date: Mon, 8 Dec 2014 10:04:18 +0100
|
|
||||||
Subject: [PATCH 4/5] redis 2.8.18: disable test failed on slow machine
|
|
||||||
|
|
||||||
---
|
|
||||||
tests/test_helper.tcl | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
|
|
||||||
index 9a6e673..0891619 100644
|
|
||||||
--- a/tests/test_helper.tcl
|
|
||||||
+++ b/tests/test_helper.tcl
|
|
||||||
@@ -36,7 +36,6 @@ set ::all_tests {
|
|
||||||
integration/replication-2
|
|
||||||
integration/replication-3
|
|
||||||
integration/replication-4
|
|
||||||
- integration/replication-psync
|
|
||||||
integration/aof
|
|
||||||
integration/rdb
|
|
||||||
integration/convert-zipmap-hash-on-load
|
|
||||||
--
|
|
||||||
2.9.0
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
|||||||
From 9502fee0927389b6feb274f2778dfb0b7b4a1459 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
|
|
||||||
Date: Sat, 13 Sep 2014 14:03:04 +0200
|
|
||||||
Subject: [PATCH 5/5] redis 2.8.18: sentinel configuration file fix
|
|
||||||
|
|
||||||
---
|
|
||||||
sentinel.conf | 5 +++++
|
|
||||||
1 file changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/sentinel.conf b/sentinel.conf
|
|
||||||
index 39d1044..543d40d 100644
|
|
||||||
--- a/sentinel.conf
|
|
||||||
+++ b/sentinel.conf
|
|
||||||
@@ -177,5 +177,10 @@ sentinel failover-timeout mymaster 180000
|
|
||||||
# Example:
|
|
||||||
#
|
|
||||||
# sentinel client-reconfig-script mymaster /var/redis/reconfig.sh
|
|
||||||
+#
|
|
||||||
+# Specify the log file name. Also the empty string 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 /var/log/redis/sentinel.log
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
2.9.0
|
|
||||||
|
|
2
macros.redis
Normal file
2
macros.redis
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
%redis_modules_abi 1
|
||||||
|
%redis_modules_dir %{_libdir}/redis/modules
|
@ -4,13 +4,21 @@
|
|||||||
#
|
#
|
||||||
# chkconfig: - 21 79
|
# chkconfig: - 21 79
|
||||||
# description: Starts and stops the redis-sentinel daemon.
|
# description: Starts and stops the redis-sentinel daemon.
|
||||||
|
#
|
||||||
|
### BEGIN INIT INFO
|
||||||
|
# Provides: redis-sentinel
|
||||||
|
# Required-Start: $local_fs $remote_fs $network
|
||||||
|
# Required-Stop: $local_fs $remote_fs $network
|
||||||
|
# Short-Description: start and stop Sentinel server
|
||||||
|
# Description: A persistent key-value database
|
||||||
|
### END INIT INFO
|
||||||
|
|
||||||
# Source function library.
|
# Source function library.
|
||||||
. /etc/rc.d/init.d/functions
|
. /etc/rc.d/init.d/functions
|
||||||
|
|
||||||
name="redis-sentinel"
|
name="redis-sentinel"
|
||||||
exec="/usr/bin/$name"
|
exec="/usr/bin/$name"
|
||||||
shut="/usr/bin/redis-shutdown"
|
shut="/usr/libexec/redis-shutdown"
|
||||||
pidfile="/var/run/redis/sentinel.pid"
|
pidfile="/var/run/redis/sentinel.pid"
|
||||||
SENTINEL_CONFIG="/etc/redis-sentinel.conf"
|
SENTINEL_CONFIG="/etc/redis-sentinel.conf"
|
||||||
|
|
||||||
@ -51,10 +59,6 @@ restart() {
|
|||||||
start
|
start
|
||||||
}
|
}
|
||||||
|
|
||||||
reload() {
|
|
||||||
false
|
|
||||||
}
|
|
||||||
|
|
||||||
rh_status() {
|
rh_status() {
|
||||||
status -p $pidfile $name
|
status -p $pidfile $name
|
||||||
}
|
}
|
||||||
@ -76,13 +80,6 @@ case "$1" in
|
|||||||
restart)
|
restart)
|
||||||
$1
|
$1
|
||||||
;;
|
;;
|
||||||
reload)
|
|
||||||
rh_status_q || exit 7
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
force-reload)
|
|
||||||
force_reload
|
|
||||||
;;
|
|
||||||
status)
|
status)
|
||||||
rh_status
|
rh_status
|
||||||
;;
|
;;
|
||||||
|
@ -3,10 +3,13 @@ Description=Redis Sentinel
|
|||||||
After=network.target
|
After=network.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --daemonize no
|
ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --supervised systemd
|
||||||
ExecStop=/usr/bin/redis-shutdown redis-sentinel
|
ExecStop=/usr/libexec/redis-shutdown redis-sentinel
|
||||||
|
Type=notify
|
||||||
User=redis
|
User=redis
|
||||||
Group=redis
|
Group=redis
|
||||||
|
RuntimeDirectory=redis
|
||||||
|
RuntimeDirectoryMode=0755
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
@ -15,9 +15,10 @@ fi
|
|||||||
CONFIG_FILE="/etc/$SERVICE_NAME.conf"
|
CONFIG_FILE="/etc/$SERVICE_NAME.conf"
|
||||||
|
|
||||||
# Use awk to retrieve host, port from config file
|
# Use awk to retrieve host, port from config file
|
||||||
HOST=`awk '/^[[:blank:]]*bind/ { print $2 }' $CONFIG_FILE`
|
HOST=`awk '/^[[:blank:]]*bind/ { print $2 }' $CONFIG_FILE | tail -n1`
|
||||||
PORT=`awk '/^[[:blank:]]*port/ { print $2 }' $CONFIG_FILE`
|
PORT=`awk '/^[[:blank:]]*port/ { print $2 }' $CONFIG_FILE | tail -n1`
|
||||||
PASS=`awk '/^[[:blank:]]*requirepass/ { print $2 }' $CONFIG_FILE`
|
PASS=`awk '/^[[:blank:]]*requirepass/ { print $2 }' $CONFIG_FILE | tail -n1`
|
||||||
|
SOCK=`awk '/^[[:blank:]]*unixsocket\s/ { print $2 }' $CONFIG_FILE | tail -n1`
|
||||||
|
|
||||||
# Just in case, use default host, port
|
# Just in case, use default host, port
|
||||||
HOST=${HOST:-127.0.0.1}
|
HOST=${HOST:-127.0.0.1}
|
||||||
@ -32,4 +33,8 @@ fi
|
|||||||
[ -z "$PASS" ] || ADDITIONAL_PARAMS="-a $PASS"
|
[ -z "$PASS" ] || ADDITIONAL_PARAMS="-a $PASS"
|
||||||
|
|
||||||
# shutdown the service properly
|
# shutdown the service properly
|
||||||
|
if [ -e "$SOCK" ] ; then
|
||||||
|
$REDIS_CLI -s $SOCK $ADDITIONAL_PARAMS shutdown
|
||||||
|
else
|
||||||
$REDIS_CLI -h $HOST -p $PORT $ADDITIONAL_PARAMS shutdown
|
$REDIS_CLI -h $HOST -p $PORT $ADDITIONAL_PARAMS shutdown
|
||||||
|
fi
|
||||||
|
21
redis.init
21
redis.init
@ -4,13 +4,21 @@
|
|||||||
#
|
#
|
||||||
# chkconfig: - 20 80
|
# chkconfig: - 20 80
|
||||||
# description: Starts and stops the redis daemon.
|
# description: Starts and stops the redis daemon.
|
||||||
|
#
|
||||||
|
### BEGIN INIT INFO
|
||||||
|
# Provides: redis-server
|
||||||
|
# Required-Start: $local_fs $remote_fs $network
|
||||||
|
# Required-Stop: $local_fs $remote_fs $network
|
||||||
|
# Short-Description: start and stop Redis server
|
||||||
|
# Description: A persistent key-value database
|
||||||
|
### END INIT INFO
|
||||||
|
|
||||||
# Source function library.
|
# Source function library.
|
||||||
. /etc/rc.d/init.d/functions
|
. /etc/rc.d/init.d/functions
|
||||||
|
|
||||||
name="redis-server"
|
name="redis-server"
|
||||||
exec="/usr/bin/$name"
|
exec="/usr/bin/$name"
|
||||||
shut="/usr/bin/redis-shutdown"
|
shut="/usr/libexec/redis-shutdown"
|
||||||
pidfile="/var/run/redis/redis.pid"
|
pidfile="/var/run/redis/redis.pid"
|
||||||
REDIS_CONFIG="/etc/redis.conf"
|
REDIS_CONFIG="/etc/redis.conf"
|
||||||
|
|
||||||
@ -51,10 +59,6 @@ restart() {
|
|||||||
start
|
start
|
||||||
}
|
}
|
||||||
|
|
||||||
reload() {
|
|
||||||
false
|
|
||||||
}
|
|
||||||
|
|
||||||
rh_status() {
|
rh_status() {
|
||||||
status -p $pidfile $name
|
status -p $pidfile $name
|
||||||
}
|
}
|
||||||
@ -76,13 +80,6 @@ case "$1" in
|
|||||||
restart)
|
restart)
|
||||||
$1
|
$1
|
||||||
;;
|
;;
|
||||||
reload)
|
|
||||||
rh_status_q || exit 7
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
force-reload)
|
|
||||||
force_reload
|
|
||||||
;;
|
|
||||||
status)
|
status)
|
||||||
rh_status
|
rh_status
|
||||||
;;
|
;;
|
||||||
|
@ -3,10 +3,13 @@ Description=Redis persistent key-value database
|
|||||||
After=network.target
|
After=network.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no
|
ExecStart=/usr/bin/redis-server /etc/redis.conf --supervised systemd
|
||||||
ExecStop=/usr/bin/redis-shutdown
|
ExecStop=/usr/libexec/redis-shutdown
|
||||||
|
Type=notify
|
||||||
User=redis
|
User=redis
|
||||||
Group=redis
|
Group=redis
|
||||||
|
RuntimeDirectory=redis
|
||||||
|
RuntimeDirectoryMode=0755
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
370
redis.spec
370
redis.spec
@ -1,6 +1,25 @@
|
|||||||
%global _hardened_build 1
|
#
|
||||||
|
# Fedora spec file for redis
|
||||||
|
#
|
||||||
|
# License: MIT
|
||||||
|
# http://opensource.org/licenses/MIT
|
||||||
|
#
|
||||||
|
# Please preserve changelog entries
|
||||||
|
#
|
||||||
%global with_perftools 0
|
%global with_perftools 0
|
||||||
|
|
||||||
|
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
|
||||||
|
%global with_redistrib 1
|
||||||
|
%else
|
||||||
|
%global with_redistrib 0
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6
|
||||||
|
%global with_pandoc 1
|
||||||
|
%else
|
||||||
|
%global with_pandoc 0
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
|
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
|
||||||
%global with_systemd 1
|
%global with_systemd 1
|
||||||
%else
|
%else
|
||||||
@ -10,8 +29,16 @@
|
|||||||
# Tests fail in mock, not in local build.
|
# Tests fail in mock, not in local build.
|
||||||
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
|
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
|
||||||
|
|
||||||
|
# Commit IDs for the (unversioned) redis-doc repository
|
||||||
|
# https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
|
||||||
|
%global doc_commit 38c2bd6f5331aad382494b3c7833b0cc2b92222a
|
||||||
|
%global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
|
||||||
|
|
||||||
|
# %%{rpmmacrodir} not usable on EL-6
|
||||||
|
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
||||||
|
|
||||||
Name: redis
|
Name: redis
|
||||||
Version: 3.2.3
|
Version: 4.0.9
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A persistent key-value database
|
Summary: A persistent key-value database
|
||||||
License: BSD
|
License: BSD
|
||||||
@ -20,25 +47,24 @@ Source0: http://download.redis.io/releases/%{name}-%{version}.tar.gz
|
|||||||
Source1: %{name}.logrotate
|
Source1: %{name}.logrotate
|
||||||
Source2: %{name}-sentinel.service
|
Source2: %{name}-sentinel.service
|
||||||
Source3: %{name}.service
|
Source3: %{name}.service
|
||||||
Source4: %{name}.tmpfiles
|
Source4: %{name}-sentinel.init
|
||||||
Source5: %{name}-sentinel.init
|
Source5: %{name}.init
|
||||||
Source6: %{name}.init
|
Source6: %{name}-shutdown
|
||||||
Source7: %{name}-shutdown
|
Source7: %{name}-limit-systemd
|
||||||
Source8: %{name}-limit-systemd
|
Source8: %{name}-limit-init
|
||||||
Source9: %{name}-limit-init
|
Source9: macros.%{name}
|
||||||
|
Source10: https://github.com/antirez/%{name}-doc/archive/%{doc_commit}/%{name}-doc-%{short_doc_commit}.tar.gz
|
||||||
|
|
||||||
# To refresh patches:
|
# To refresh patches:
|
||||||
# tar xf redis-xxx.tar.gz && cd redis-xxx && git init && git add . && git commit -m "%{version} baseline"
|
# tar xf redis-xxx.tar.gz && cd redis-xxx && git init && git add . && git commit -m "%%{version} baseline"
|
||||||
# git am %{patches}
|
# git am %%{patches}
|
||||||
# Then refresh your patches
|
# Then refresh your patches
|
||||||
# git format-patch HEAD~<number of expected patches>
|
# git format-patch HEAD~<number of expected patches>
|
||||||
# Update configuration for Fedora
|
# Update configuration for Fedora
|
||||||
Patch0001: 0001-redis-3.2.3-redis-conf.patch
|
# https://github.com/antirez/redis/pull/3491 - man pages
|
||||||
Patch0002: 0002-redis-3.2.3-deps-library-fPIC-performance-tuning.patch
|
Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
|
||||||
Patch0003: 0003-redis-2.8.18-use-system-jemalloc.patch
|
# https://github.com/antirez/redis/pull/3494 - symlink
|
||||||
# tests/integration/replication-psync.tcl failed on slow machines(GITHUB #1417)
|
Patch0002: 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
|
||||||
Patch0004: 0004-redis-2.8.18-disable-test-failed-on-slow-machine.patch
|
|
||||||
# Fix sentinel configuration to use a different log file than redis
|
|
||||||
Patch0005: 0005-redis-2.8.18-sentinel-configuration-file-fix.patch
|
|
||||||
%if 0%{?with_perftools}
|
%if 0%{?with_perftools}
|
||||||
BuildRequires: gperftools-devel
|
BuildRequires: gperftools-devel
|
||||||
%else
|
%else
|
||||||
@ -46,13 +72,14 @@ BuildRequires: jemalloc-devel
|
|||||||
%endif
|
%endif
|
||||||
%if 0%{?with_tests}
|
%if 0%{?with_tests}
|
||||||
BuildRequires: procps-ng
|
BuildRequires: procps-ng
|
||||||
|
BuildRequires: tcl
|
||||||
|
%endif
|
||||||
|
%if 0%{?with_pandoc}
|
||||||
|
BuildRequires: pandoc
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?with_systemd}
|
%if 0%{?with_systemd}
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?with_tests}
|
|
||||||
BuildRequires: tcl
|
|
||||||
%endif
|
|
||||||
# Required for redis-shutdown
|
# Required for redis-shutdown
|
||||||
Requires: /bin/awk
|
Requires: /bin/awk
|
||||||
Requires: logrotate
|
Requires: logrotate
|
||||||
@ -67,6 +94,13 @@ Requires(preun): chkconfig
|
|||||||
Requires(preun): initscripts
|
Requires(preun): initscripts
|
||||||
Requires(postun): initscripts
|
Requires(postun): initscripts
|
||||||
%endif
|
%endif
|
||||||
|
Provides: bundled(hiredis)
|
||||||
|
Provides: bundled(lua-libs)
|
||||||
|
Provides: bundled(linenoise)
|
||||||
|
|
||||||
|
%global redis_modules_abi 1
|
||||||
|
%global redis_modules_dir %{_libdir}/%{name}/modules
|
||||||
|
Provides: redis(modules_abi)%{?_isa} = %{redis_modules_abi}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Redis is an advanced key-value store. It is often referred to as a data
|
Redis is an advanced key-value store. It is often referred to as a data
|
||||||
@ -93,86 +127,161 @@ a cache.
|
|||||||
|
|
||||||
You can use Redis from most programming languages also.
|
You can use Redis from most programming languages also.
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Development header for Redis module development
|
||||||
|
# Header-Only Library (https://fedoraproject.org/wiki/Packaging:Guidelines)
|
||||||
|
Provides: %{name}-static = %{version}-%{release}
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
Header file required for building loadable Redis modules. Detailed
|
||||||
|
API documentation is available in the redis-doc package.
|
||||||
|
|
||||||
|
%package doc
|
||||||
|
Summary: Documentation for Redis including man pages
|
||||||
|
License: CC-BY-SA
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
# http://fedoraproject.org/wiki/Packaging:Conflicts "Splitting Packages"
|
||||||
|
Conflicts: redis < 4.0
|
||||||
|
|
||||||
|
%description doc
|
||||||
|
Manual pages and detailed documentation for many aspects of Redis use,
|
||||||
|
administration and development.
|
||||||
|
|
||||||
|
%if 0%{?with_redistrib}
|
||||||
|
%package trib
|
||||||
|
Summary: Cluster management script for Redis
|
||||||
|
BuildArch: noarch
|
||||||
|
Requires: ruby
|
||||||
|
Requires: rubygem-redis
|
||||||
|
|
||||||
|
%description trib
|
||||||
|
Redis cluster management utility providing cluster creation, node addition
|
||||||
|
and removal, status checks, resharding, rebalancing, and other operations.
|
||||||
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
|
%setup -q -b 10
|
||||||
%setup -q
|
%setup -q
|
||||||
|
mv ../%{name}-doc-%{doc_commit} doc
|
||||||
rm -frv deps/jemalloc
|
rm -frv deps/jemalloc
|
||||||
%patch0001 -p1
|
%patch0001 -p1
|
||||||
%patch0002 -p1
|
%patch0002 -p1
|
||||||
%patch0003 -p1
|
|
||||||
%patch0004 -p1
|
|
||||||
%patch0005 -p1
|
|
||||||
|
|
||||||
# No hidden build.
|
# Use system jemalloc library
|
||||||
sed -i -e 's|\t@|\t|g' deps/lua/src/Makefile
|
sed -i -e '/cd jemalloc && /d' deps/Makefile
|
||||||
sed -i -e 's|$(QUIET_CC)||g' src/Makefile
|
sed -i -e 's|../deps/jemalloc/lib/libjemalloc.a|-ljemalloc -ldl|g' src/Makefile
|
||||||
sed -i -e 's|$(QUIET_LINK)||g' src/Makefile
|
sed -i -e 's|-I../deps/jemalloc.*|-DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc|g' src/Makefile
|
||||||
sed -i -e 's|$(QUIET_INSTALL)||g' src/Makefile
|
|
||||||
# Ensure deps are built with proper flags
|
# Configuration file changes and additions
|
||||||
sed -i -e 's|$(CFLAGS)|%{optflags}|g' deps/Makefile
|
sed -i -e 's|^logfile .*$|logfile /var/log/redis/redis.log|g' redis.conf
|
||||||
sed -i -e 's|OPTIMIZATION?=-O3|OPTIMIZATION=%{optflags}|g' deps/hiredis/Makefile
|
sed -i -e '$ alogfile /var/log/redis/sentinel.log' sentinel.conf
|
||||||
sed -i -e 's|$(LDFLAGS)|%{?__global_ldflags}|g' deps/hiredis/Makefile
|
sed -i -e 's|^dir .*$|dir /var/lib/redis|g' redis.conf
|
||||||
sed -i -e 's|$(CFLAGS)|%{optflags}|g' deps/linenoise/Makefile
|
|
||||||
sed -i -e 's|$(LDFLAGS)|%{?__global_ldflags}|g' deps/linenoise/Makefile
|
# Module API version safety check
|
||||||
|
api=`sed -n -e 's/#define REDISMODULE_APIVER_[0-9][0-9]* //p' src/redismodule.h`
|
||||||
|
if test "$api" != "%{redis_modules_abi}"; then
|
||||||
|
: Error: Upstream API version is now ${api}, expecting %%{redis_modules_abi}.
|
||||||
|
: Update the redis_modules_abi macro, the rpmmacros file, and rebuild.
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
%if 0%{?with_pandoc}
|
||||||
|
docs=`find doc -name \*.md | sed -e 's|.md$||g'`
|
||||||
|
for doc in $docs; do
|
||||||
|
pandoc --standalone --from markdown --to html --output $doc.html $doc.md
|
||||||
|
done
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?with_perftools}
|
||||||
|
%global malloc_flags MALLOC=tcmalloc
|
||||||
|
%else
|
||||||
|
%global malloc_flags MALLOC=jemalloc
|
||||||
|
%endif
|
||||||
|
%global make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" %{malloc_flags} INSTALL="install -p" PREFIX=%{buildroot}%{_prefix}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} \
|
make %{?_smp_mflags} %{make_flags} all
|
||||||
DEBUG="" \
|
|
||||||
LDFLAGS="%{?__global_ldflags}" \
|
|
||||||
CFLAGS+="%{optflags}" \
|
|
||||||
LUA_LDFLAGS+="%{?__global_ldflags}" \
|
|
||||||
%if 0%{?with_perftools}
|
|
||||||
MALLOC=tcmalloc \
|
|
||||||
%else
|
|
||||||
MALLOC=jemalloc \
|
|
||||||
%endif
|
|
||||||
all
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install INSTALL="install -p" PREFIX=%{buildroot}%{_prefix}
|
make %{make_flags} install
|
||||||
|
|
||||||
# Filesystem.
|
# Filesystem.
|
||||||
install -d %{buildroot}%{_sharedstatedir}/%{name}
|
install -d %{buildroot}%{_sharedstatedir}/%{name}
|
||||||
install -d %{buildroot}%{_localstatedir}/log/%{name}
|
install -d %{buildroot}%{_localstatedir}/log/%{name}
|
||||||
install -d %{buildroot}%{_localstatedir}/run/%{name}
|
install -d %{buildroot}%{_localstatedir}/run/%{name}
|
||||||
|
install -d %{buildroot}%{redis_modules_dir}
|
||||||
|
|
||||||
# Install logrotate file.
|
# Install logrotate file.
|
||||||
install -pDm644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
|
install -pDm644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
|
||||||
|
|
||||||
# Install configuration files.
|
# Install configuration files.
|
||||||
install -pDm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
|
install -pDm640 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
|
||||||
install -pDm644 sentinel.conf %{buildroot}%{_sysconfdir}/%{name}-sentinel.conf
|
install -pDm640 sentinel.conf %{buildroot}%{_sysconfdir}/%{name}-sentinel.conf
|
||||||
|
|
||||||
# Install Systemd unit files.
|
# Install systemd unit files.
|
||||||
%if 0%{?with_systemd}
|
%if 0%{?with_systemd}
|
||||||
mkdir -p %{buildroot}%{_unitdir}
|
mkdir -p %{buildroot}%{_unitdir}
|
||||||
install -pm644 %{S:3} %{buildroot}%{_unitdir}
|
install -pm644 %{S:3} %{buildroot}%{_unitdir}
|
||||||
install -pm644 %{S:2} %{buildroot}%{_unitdir}
|
install -pm644 %{S:2} %{buildroot}%{_unitdir}
|
||||||
|
|
||||||
# Install systemd tmpfiles config.
|
|
||||||
install -pDm644 %{S:4} %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
|
||||||
# Install systemd limit files (requires systemd >= 204)
|
# Install systemd limit files (requires systemd >= 204)
|
||||||
install -p -D -m 644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
|
install -p -D -m 644 %{S:7} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
|
||||||
install -p -D -m 644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf
|
install -p -D -m 644 %{S:7} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf
|
||||||
%else # install SysV service files
|
%else # install SysV service files
|
||||||
install -pDm755 %{S:5} %{buildroot}%{_initrddir}/%{name}-sentinel
|
install -pDm755 %{S:4} %{buildroot}%{_initrddir}/%{name}-sentinel
|
||||||
install -pDm755 %{S:6} %{buildroot}%{_initrddir}/%{name}
|
install -pDm755 %{S:5} %{buildroot}%{_initrddir}/%{name}
|
||||||
install -p -D -m 644 %{S:9} %{buildroot}%{_sysconfdir}/security/limits.d/95-%{name}.conf
|
install -p -D -m 644 %{S:8} %{buildroot}%{_sysconfdir}/security/limits.d/95-%{name}.conf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Fix non-standard-executable-perm error.
|
# Fix non-standard-executable-perm error.
|
||||||
chmod 755 %{buildroot}%{_bindir}/%{name}-*
|
chmod 755 %{buildroot}%{_bindir}/%{name}-*
|
||||||
|
|
||||||
# create redis-sentinel command as described on
|
|
||||||
# http://redis.io/topics/sentinel
|
|
||||||
ln -sf %{name}-server %{buildroot}%{_bindir}/%{name}-sentinel
|
|
||||||
|
|
||||||
# Install redis-shutdown
|
# Install redis-shutdown
|
||||||
install -pDm755 %{S:7} %{buildroot}%{_bindir}/%{name}-shutdown
|
install -pDm755 %{S:6} %{buildroot}%{_libexecdir}/%{name}-shutdown
|
||||||
|
|
||||||
|
# Install redis module header
|
||||||
|
install -pDm644 src/%{name}module.h %{buildroot}%{_includedir}/%{name}module.h
|
||||||
|
|
||||||
|
%if 0%{?with_redistrib}
|
||||||
|
# Install redis-trib
|
||||||
|
install -pDm755 src/%{name}-trib.rb %{buildroot}%{_bindir}/%{name}-trib
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Install man pages
|
||||||
|
man=$(dirname %{buildroot}%{_mandir})
|
||||||
|
for page in man/man?/*; do
|
||||||
|
install -Dpm644 $page $man/$page
|
||||||
|
done
|
||||||
|
ln -s redis-server.1 %{buildroot}%{_mandir}/man1/redis-sentinel.1
|
||||||
|
ln -s redis.conf.5 %{buildroot}%{_mandir}/man5/redis-sentinel.conf.5
|
||||||
|
|
||||||
|
# Install documentation and html pages
|
||||||
|
doc=$(echo %{buildroot}/%{_docdir}/%{name})
|
||||||
|
for page in 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO; do
|
||||||
|
install -Dpm644 $page $doc/$page
|
||||||
|
done
|
||||||
|
for page in $(find doc -name \*.md | sed -e 's|.md$||g'); do
|
||||||
|
base=$(echo $page | sed -e 's|doc/||g')
|
||||||
|
install -Dpm644 $page.md $doc/$base.md
|
||||||
|
%if 0%{?with_pandoc}
|
||||||
|
install -Dpm644 $page.html $doc/$base.html
|
||||||
|
%endif
|
||||||
|
done
|
||||||
|
|
||||||
|
# Install rpm macros for redis modules
|
||||||
|
mkdir -p %{buildroot}%{macrosdir}
|
||||||
|
install -pDm644 %{S:9} %{buildroot}%{macrosdir}/macros.%{name}
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if 0%{?with_tests}
|
%if 0%{?with_tests}
|
||||||
make test ||:
|
# ERR Active defragmentation cannot be enabled: it requires a Redis server compiled
|
||||||
make test-sentinel ||:
|
# 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")
|
||||||
|
taskset -c 1 make %{make_flags} test
|
||||||
|
make %{make_flags} test-sentinel
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
@ -219,30 +328,151 @@ fi
|
|||||||
%files
|
%files
|
||||||
%{!?_licensedir:%global license %%doc}
|
%{!?_licensedir:%global license %%doc}
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
|
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
||||||
%attr(0644, redis, root) %config(noreplace) %{_sysconfdir}/%{name}.conf
|
%attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}.conf
|
||||||
%attr(0644, redis, root) %config(noreplace) %{_sysconfdir}/%{name}-sentinel.conf
|
%attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}-sentinel.conf
|
||||||
%dir %attr(0755, redis, redis) %{_sharedstatedir}/%{name}
|
%dir %attr(0750, redis, redis) %{_libdir}/%{name}
|
||||||
%dir %attr(0755, redis, redis) %{_localstatedir}/log/%{name}
|
%dir %attr(0750, redis, redis) %{redis_modules_dir}
|
||||||
%dir %attr(0755, redis, redis) %{_localstatedir}/run/%{name}
|
%dir %attr(0750, redis, redis) %{_sharedstatedir}/%{name}
|
||||||
|
%dir %attr(0750, redis, redis) %{_localstatedir}/log/%{name}
|
||||||
|
%if 0%{?with_redistrib}
|
||||||
|
%exclude %{_bindir}/%{name}-trib
|
||||||
|
%endif
|
||||||
|
%exclude %{macrosdir}
|
||||||
|
%exclude %{_includedir}
|
||||||
|
%exclude %{_docdir}/%{name}/*
|
||||||
%{_bindir}/%{name}-*
|
%{_bindir}/%{name}-*
|
||||||
|
%{_libexecdir}/%{name}-*
|
||||||
|
%{_mandir}/man1/%{name}*
|
||||||
|
%{_mandir}/man5/%{name}*
|
||||||
%if 0%{?with_systemd}
|
%if 0%{?with_systemd}
|
||||||
%{_tmpfilesdir}/%{name}.conf
|
|
||||||
%{_unitdir}/%{name}.service
|
%{_unitdir}/%{name}.service
|
||||||
%{_unitdir}/%{name}-sentinel.service
|
%{_unitdir}/%{name}-sentinel.service
|
||||||
%dir %{_sysconfdir}/systemd/system/%{name}.service.d
|
%dir %{_sysconfdir}/systemd/system/%{name}.service.d
|
||||||
%config(noreplace) %{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
|
%config(noreplace) %{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
|
||||||
%dir %{_sysconfdir}/systemd/system/%{name}-sentinel.service.d
|
%dir %{_sysconfdir}/systemd/system/%{name}-sentinel.service.d
|
||||||
%config(noreplace) %{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf
|
%config(noreplace) %{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf
|
||||||
|
%dir %attr(0755, redis, redis) %ghost %{_localstatedir}/run/%{name}
|
||||||
%else
|
%else
|
||||||
%{_initrddir}/%{name}
|
%{_initrddir}/%{name}
|
||||||
%{_initrddir}/%{name}-sentinel
|
%{_initrddir}/%{name}-sentinel
|
||||||
%config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf
|
%config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf
|
||||||
|
%dir %attr(0755, redis, redis) %{_localstatedir}/run/%{name}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%license COPYING
|
||||||
|
%{_includedir}/%{name}module.h
|
||||||
|
%{macrosdir}/*
|
||||||
|
|
||||||
|
%files doc
|
||||||
|
%docdir %{_docdir}/%{name}
|
||||||
|
%{_docdir}/%{name}
|
||||||
|
|
||||||
|
%if 0%{?with_redistrib}
|
||||||
|
%files trib
|
||||||
|
%license COPYING
|
||||||
|
%{_bindir}/%{name}-trib
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 27 2018 Nathan Scott <nathans@redhat.com> - 4.0.9-1
|
||||||
|
- Upstream 4.0.9 release.
|
||||||
|
|
||||||
|
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.0.8-2
|
||||||
|
- Escape macros in %%changelog
|
||||||
|
|
||||||
|
* Wed Feb 7 2018 Nathan Scott <nathans@redhat.com> - 4.0.8-1
|
||||||
|
- Upstream 4.0.8 release.
|
||||||
|
|
||||||
|
* Wed Jan 31 2018 Nathan Scott <nathans@redhat.com> - 4.0.7-1
|
||||||
|
- Upstream 4.0.7 release.
|
||||||
|
|
||||||
|
* Thu Dec 7 2017 Nathan Scott <nathans@redhat.com> - 4.0.6-1
|
||||||
|
- Upstream 4.0.6 release.
|
||||||
|
|
||||||
|
* Fri Dec 1 2017 Remi Collet <remi@remirepo.net> - 4.0.5-1
|
||||||
|
- Redis 4.0.5 - Released Thu Dec 1 16:03:32 CET 2017
|
||||||
|
- Upgrade urgency CRITICAL: Redis 4.0.4 fix for PSYNC2 was broken,
|
||||||
|
causing the slave to crash when receiving an RDB file from the
|
||||||
|
master that contained a duplicated Lua script.
|
||||||
|
|
||||||
|
* Fri Dec 01 2017 Nathan Scott <nathans@redhat.com> - 4.0.4-1
|
||||||
|
- Upstream 4.0.4 release.
|
||||||
|
- Update to current upstream redis-doc also.
|
||||||
|
- Fix man page issues (RHBZ #1513594 and RHBZ #1515417).
|
||||||
|
|
||||||
|
* Thu Nov 30 2017 Remi Collet <remi@remirepo.net> - 4.0.3-1
|
||||||
|
- Redis 4.0.3
|
||||||
|
- fix ownership of /usr/share/doc/redis
|
||||||
|
- use make_flags for test to avoid rebuild and failure
|
||||||
|
- fix rpm macro location on EL-6
|
||||||
|
- add /var/run/redis on EL-6
|
||||||
|
- add spec file license header
|
||||||
|
- drop duplicated documentation from main package
|
||||||
|
- keep man in main page
|
||||||
|
|
||||||
|
* Fri Nov 17 2017 Nathan Scott <nathans@redhat.com> - 4.0.2-2
|
||||||
|
- Install the base modules directories, owned by the main package.
|
||||||
|
|
||||||
|
* Tue Oct 31 2017 Nathan Scott <nathans@redhat.com> - 4.0.2-1
|
||||||
|
- Upstream 4.0.2 release. (RHBZ #1389592)
|
||||||
|
- Add redis-devel for loadable module development.
|
||||||
|
- Add redis-doc for man pages and detailed documentation.
|
||||||
|
- Provide redis-check-aof as a symlink to redis-server also now.
|
||||||
|
|
||||||
|
* Tue Sep 26 2017 Nathan Scott <nathans@redhat.com> - 3.2.11-1
|
||||||
|
- Upstream 3.2.11 bug-fix-only release
|
||||||
|
- Switch to using Type=notify for Redis systemd services (RHBZ #1172841)
|
||||||
|
- Add Provides:bundled hiredis, linenoise, lua-libs clauses (RHBZ #788500)
|
||||||
|
|
||||||
|
* Mon Aug 14 2017 Nathan Scott <nathans@redhat.com> - 3.2.10-2
|
||||||
|
- Add redis-trib based on patch from Sebastian Saletnik. (RHBZ #1215654)
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 31 2017 Nathan Scott <nathans@redhat.com> - 3.2.10-1
|
||||||
|
- Upstream 3.2.10 release
|
||||||
|
- Ensure both the redis and redis-sentinel service files set correct perms
|
||||||
|
- Dropped systemd tmpfiles source, handled directly in systemd service files
|
||||||
|
|
||||||
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon May 29 2017 Nathan Scott <nathans@redhat.com> - 3.2.9-1
|
||||||
|
- Upstream 3.2.9
|
||||||
|
- Add RuntimeDirectory=redis to systemd unit file (RHBZ #1454700)
|
||||||
|
- Mark rundir as %%ghost since it may disappear (tmpfs - #1454700)
|
||||||
|
- Fix a shutdown failure with Unix domain sockets (RHBZ #1444988)
|
||||||
|
|
||||||
|
* Mon Feb 20 2017 Haïkel Guémar <hguemar@fedoraproject.org> - 3.2.8-1
|
||||||
|
- Upstream 3.2.8
|
||||||
|
- bugfix for #3796 (MIGRATE could cause server crash after socket error)
|
||||||
|
|
||||||
|
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 4 2017 Haïkel Guémar <hguemar@fedoraproject.org> - 3.2.7-1
|
||||||
|
- Upstream 3.2.7 (important security fix)
|
||||||
|
|
||||||
|
* Sat Nov 05 2016 Alan Pevec <apevec AT redhat.com> - 3.2.4-2
|
||||||
|
- Install tmpfiles and /run/redis for legacy configurations
|
||||||
|
|
||||||
|
* Mon Sep 26 2016 Haïkel Guémar <hguemar@fedoraproject.org> - 3.2.4-1
|
||||||
|
- Upstream 3.2.4
|
||||||
|
- Fix buffer overlow (TALOS-2016-0206)
|
||||||
|
|
||||||
|
* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 3.2.3-2
|
||||||
|
- add missing man pages #1374577
|
||||||
|
using patch from https://github.com/antirez/redis/pull/3491
|
||||||
|
- data and configuration should not be publicly readable #1374700
|
||||||
|
- remove /var/run/redis with systemd #1374728
|
||||||
|
- provide redis-check-rdb as a symlink to redis-server #1374736
|
||||||
|
using patch from https://github.com/antirez/redis/pull/3494
|
||||||
|
- move redis-shutdown to libexec
|
||||||
|
|
||||||
* Thu Aug 4 2016 Haïkel Guémar <hguemar@fedoraproject.org> - 3.2.3-1
|
* Thu Aug 4 2016 Haïkel Guémar <hguemar@fedoraproject.org> - 3.2.3-1
|
||||||
- Upstream 3.2.3
|
- Upstream 3.2.3
|
||||||
- Security fix for CVE-2013-7458 (redis-cli history world readable)
|
- Security fix for CVE-2013-7458 (redis-cli history world readable)
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
# redis runtime directory
|
|
||||||
d /run/redis 0755 redis redis -
|
|
3
sources
3
sources
@ -1 +1,2 @@
|
|||||||
138209b54dfc9819e6aea7b9503f8bd3 redis-3.2.3.tar.gz
|
SHA512 (redis-4.0.9.tar.gz) = a6cf63cb361f0a87da3955ba628190dc04cad342f7a664d18e44416ee67dd86ed6e3a46b9701e994f1417e56b819b3c6fc595f363c10bb4b83d5033919d29598
|
||||||
|
SHA512 (redis-doc-38c2bd6.tar.gz) = b878e43e942c24b0bb195d36f50e0f7f3efc1aab339c8a7f9bd9c04318a13bfad41334a9f08e4e865c5708221b421a3e7a0f343a9fe728f3f9b4eb1404ef8517
|
||||||
|
Loading…
Reference in New Issue
Block a user