Skip to content

Commit 0a55784

Browse files
authored
Upgrade redis-server to 3.2.11 (#1381)
* extern: synced with the upstream redis/3.2 @c9ab43e * extern: applied patches * extern: rename redis-3.2.8 to redis-3.2.10 * extern: upgrade to redis-3.2.11 * Update Makefile * Update Makefile
1 parent d17932b commit 0a55784

File tree

611 files changed

+1234
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

611 files changed

+1234
-111
lines changed

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ codis-fe: codis-deps
2929
codis-server:
3030
@mkdir -p bin
3131
@rm -f bin/codis-server*
32-
make -j4 -C extern/redis-3.2.8/
33-
@cp -f extern/redis-3.2.8/src/redis-server bin/codis-server
34-
@cp -f extern/redis-3.2.8/src/redis-benchmark bin/
35-
@cp -f extern/redis-3.2.8/src/redis-cli bin/
36-
@cp -f extern/redis-3.2.8/src/redis-sentinel bin/
37-
@cp -f extern/redis-3.2.8/redis.conf config/
38-
@sed -e "s/^sentinel/# sentinel/g" extern/redis-3.2.8/sentinel.conf > config/sentinel.conf
32+
make -j4 -C extern/redis-3.2.11/
33+
@cp -f extern/redis-3.2.11/src/redis-server bin/codis-server
34+
@cp -f extern/redis-3.2.11/src/redis-benchmark bin/
35+
@cp -f extern/redis-3.2.11/src/redis-cli bin/
36+
@cp -f extern/redis-3.2.11/src/redis-sentinel bin/
37+
@cp -f extern/redis-3.2.11/redis.conf config/
38+
@sed -e "s/^sentinel/# sentinel/g" extern/redis-3.2.11/sentinel.conf > config/sentinel.conf
3939

4040
clean-gotest:
4141
@rm -rf ./pkg/topom/gotest.tmp
@@ -45,7 +45,7 @@ clean: clean-gotest
4545
@rm -rf scripts/tmp
4646

4747
distclean: clean
48-
@make --no-print-directory --quiet -C extern/redis-3.2.8 distclean
48+
@make --no-print-directory --quiet -C extern/redis-3.2.11 distclean
4949
@make --no-print-directory --quiet -C vendor/github.com/spinlock/jemalloc-go/ distclean
5050

5151
gotest: codis-deps
File renamed without changes.

extern/redis-3.2.8/00-RELEASENOTES renamed to extern/redis-3.2.11/00-RELEASENOTES

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,156 @@ HIGH: There is a critical bug that may affect a subset of users. Upgrade!
1010
CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP.
1111
--------------------------------------------------------------------------------
1212

13+
================================================================================
14+
Redis 3.2.11 Released Thu Sep 21 15:47:53 CEST 2017
15+
================================================================================
16+
17+
Upgrade urgency HIGH: Potentially critical bugs fixed.
18+
19+
AOF flush on SHUTDOWN did not cared to really write the AOF buffers
20+
(not in the kernel but in the Redis process memory) to disk before exiting.
21+
Calling SHUTDOWN during traffic resulted into not every operation to be
22+
persisted on disk.
23+
24+
Oran Agra (and also Buğra Gedik) in commit 8651e5d5:
25+
Flush append only buffers before existing.
26+
1 file changed, 2 insertions(+), 1 deletion(-)
27+
28+
================================================================================
29+
Redis 3.2.10 Released Fri Jul 28 17:49:07 CEST 2017
30+
================================================================================
31+
32+
Upgrade urgency MODERATE: This release contains a number of fixes that are not
33+
critical in the general case, but quite important
34+
in certain use cases. Upgrading is suggested but not
35+
mandatory.
36+
37+
Dear Redis users,
38+
39+
while 4.0.1 is already out, this is a maintenance release of Redis 3.2.
40+
It fixes several bugs, the most interesting ones are the following:
41+
42+
1. INFO server.stat_net_output_bytes field was computed in a wrong way, now
43+
the output is correct.
44+
2. SET with EX/PX options are now propagated correctly in the AOF, using
45+
the absolute times.
46+
3. CLIENT PAUSE was fixed to prevent eviction of keys, so that master and
47+
slave continue to be consistent for the time the pause is active.
48+
4. GEORADIUS(BYMEMBER)_RO variants for read-only operations added.
49+
5. HyperLogLog sanity detection fixed in an edge case.
50+
6. Redis Cluster crash due to mis-handling of hidden node flags fixed.
51+
52+
If you think you may be affected by the above problems, upgrading is a
53+
good idea.
54+
55+
Have a nice day,
56+
Salvatore
57+
58+
Full history of commits in this release:
59+
60+
Jan-Erik Rediger in commit bf508753:
61+
Check that the whole first argument is a number
62+
1 file changed, 3 insertions(+), 2 deletions(-)
63+
64+
WuYunlong in commit 8774228c:
65+
fix rewrite config: auto-aof-rewrite-min-size
66+
1 file changed, 2 insertions(+), 2 deletions(-)
67+
68+
Byron Grobe in commit ab900303:
69+
Fixed issue #1996 (Missing '-' in help message for redis-benchmark)
70+
1 file changed, 1 insertion(+), 1 deletion(-)
71+
72+
Jan-Erik Rediger in commit 7fcca9ba:
73+
Don't use extended Regexp Syntax
74+
1 file changed, 6 insertions(+), 6 deletions(-)
75+
76+
Leon Chen in commit 41963fe6:
77+
fix return wrong value of clusterDelNodeSlots
78+
1 file changed, 4 insertions(+), 2 deletions(-)
79+
80+
Leon Chen in commit 97d50344:
81+
fix mismatch argument
82+
1 file changed, 1 insertion(+), 1 deletion(-)
83+
84+
liangsijian in commit e3984980:
85+
Fix lua ldb command log
86+
1 file changed, 1 insertion(+)
87+
88+
antirez in commit 84a4f202:
89+
Make representClusterNodeFlags() more robust.
90+
1 file changed, 17 insertions(+), 16 deletions(-)
91+
92+
antirez in commit 5aa25250:
93+
Fix isHLLObjectOrReply() to handle integer encoded strings.
94+
1 file changed, 1 insertion(+)
95+
96+
antirez in commit 7018d27d:
97+
Fix abort typo in Lua debugger help screen.
98+
1 file changed, 1 insertion(+), 1 deletion(-)
99+
100+
antirez in commit d557144e:
101+
Added GEORADIUS(BYMEMBER)_RO variants for read-only operations.
102+
3 files changed, 32 insertions(+), 11 deletions(-)
103+
104+
Suraj Narkhede in commit a309388d:
105+
Fix following issues in blocking commands: 1. brpop last key index, thus checking all keys for slots. 2. Memory leak in clusterRedirectBlockedClientIfNeeded. 3. Remove while loop in clusterRedirectBlockedClientIfNeeded.
106+
1 file changed, 1 insertion(+)
107+
108+
Suraj Narkhede in commit 55442262:
109+
Fix brpop command table entry and redirect blocked clients.
110+
2 files changed, 3 insertions(+), 2 deletions(-)
111+
112+
antirez in commit e3641c8d:
113+
Fix PERSIST expired key resuscitation issue #4048.
114+
1 file changed, 4 insertions(+), 7 deletions(-)
115+
116+
Antonio Mallia in commit 9ce105ad:
117+
Removed duplicate 'sys/socket.h' include
118+
1 file changed, 1 deletion(-)
119+
120+
Zachary Marquez in commit e084a394:
121+
Prevent expirations and evictions while paused
122+
1 file changed, 10 insertions(+)
123+
124+
antirez in commit 61c78a52:
125+
Collect fork() timing info only if fork succeeded.
126+
1 file changed, 4 insertions(+), 3 deletions(-)
127+
128+
antirez in commit d067e334:
129+
Aesthetic changes to #4068 PR to conform to Redis coding standard.
130+
1 file changed, 6 insertions(+), 7 deletions(-)
131+
132+
xuzhou in commit 2b0f03e4:
133+
Optimize set command with ex/px when updating aof.
134+
1 file changed, 3 insertions(+), 3 deletions(-)
135+
136+
antirez in commit ad949f23:
137+
redis-benchmark: add -t hset target.
138+
1 file changed, 7 insertions(+)
139+
140+
xuzhou in commit 351663bd:
141+
Fix set with ex/px option when propagated to aof
142+
4 files changed, 36 insertions(+), 1 deletion(-)
143+
144+
minghang.zmh in commit d70ac1d1:
145+
fix server.stat_net_output_bytes calc bug
146+
1 file changed, 1 insertion(+), 1 deletion(-)
147+
148+
xuchengxuan in commit 8da9a167:
149+
Fixed comments of slowlog duration
150+
1 file changed, 1 insertion(+), 1 deletion(-)
151+
152+
cbgbt in commit 13546adc:
153+
cli: Only print elapsed time on OUTPUT_STANDARD
154+
1 file changed, 3 insertions(+), 1 deletion(-)
155+
156+
Aric Huang in commit 373facf8:
157+
(fix) Update create-cluster README
158+
1 file changed, 4 insertions(+), 4 deletions(-)
159+
160+
Salvatore Sanfilippo in commit 29e3ff9b:
161+
Merge pull request #3926 from QuChen88/3.2
162+
13163
================================================================================
14164
Redis 3.2.9 Released Mon May 17 17:35:38 CEST 2017
15165
================================================================================
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)