gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,225 Commits 1 Branch 0 Tags
Commit Graph

10225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
antirez
83af8ef1fd Allow scripts to timeout even if from the master instance. 
However the master scripts will be impossible to kill.

Related to #5297.
 2018-08-31 16:45:02 +02:00
antirez
adbc48bcc9 Allow scripts to timeout even if from the master instance. 
However the master scripts will be impossible to kill.

Related to #5297.
 2018-08-31 16:45:02 +02:00
antirez
f5b29c6444 Allow scripts to timeout on slaves as well. 
See reasoning in #5297.
 2018-08-31 16:45:01 +02:00
antirez
4add364a4e Allow scripts to timeout on slaves as well. 
See reasoning in #5297.
 2018-08-31 16:45:01 +02:00
zhaozhao.zz
dce7cefb7c networking: fix unexpected negative or zero readlen 
To avoid copying buffers to create a large Redis Object which
exceeding PROTO_IOBUF_LEN 32KB, we just read the remaining data
we need, which may less than PROTO_IOBUF_LEN. But the remaining
len may be zero, if the bulklen+2 equals sdslen(c->querybuf),
in client pause context.

For example:

Time1:

python
>>> import os, socket
>>> server="127.0.0.1"
>>> port=6379
>>> data1="*3\r\n$3\r\nset\r\n$1\r\na\r\n$33000\r\n"
>>> data2="".join("x" for _ in range(33000)) + "\r\n"
>>> data3="\n\n"
>>> s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
>>> s.settimeout(10)
>>> s.connect((server, port))
>>> s.send(data1)
28

Time2:

redis-cli client pause 10000

Time3:

>>> s.send(data2)
33002
>>> s.send(data3)
2
>>> s.send(data3)
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
socket.error: [Errno 104] Connection reset by peer

To fix that, we should check if remaining is greater than zero.
 2018-08-31 20:02:09 +08:00
zhaozhao.zz
f20408777a networking: fix unexpected negative or zero readlen 
To avoid copying buffers to create a large Redis Object which
exceeding PROTO_IOBUF_LEN 32KB, we just read the remaining data
we need, which may less than PROTO_IOBUF_LEN. But the remaining
len may be zero, if the bulklen+2 equals sdslen(c->querybuf),
in client pause context.

For example:

Time1:

python
>>> import os, socket
>>> server="127.0.0.1"
>>> port=6379
>>> data1="*3\r\n$3\r\nset\r\n$1\r\na\r\n$33000\r\n"
>>> data2="".join("x" for _ in range(33000)) + "\r\n"
>>> data3="\n\n"
>>> s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
>>> s.settimeout(10)
>>> s.connect((server, port))
>>> s.send(data1)
28

Time2:

redis-cli client pause 10000

Time3:

>>> s.send(data2)
33002
>>> s.send(data3)
2
>>> s.send(data3)
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
socket.error: [Errno 104] Connection reset by peer

To fix that, we should check if remaining is greater than zero.
 2018-08-31 20:02:09 +08:00
Salvatore Sanfilippo
d05f5c8f64
Merge pull request #5268 from 0xtonyxia/fix-latency-cmd-comments2 
Revise the comments of latency command.
 2018-08-29 16:19:13 +02:00
Salvatore Sanfilippo
b9fa80313e Merge pull request #5268 from 0xtonyxia/fix-latency-cmd-comments2 
Revise the comments of latency command.
 2018-08-29 16:19:13 +02:00
Salvatore Sanfilippo
476eea95da
Merge pull request #4216 from lamby/did-not-received-typos 
Correct "did not received" -> "did not receive" typos/grammar.
 2018-08-29 16:18:11 +02:00
Salvatore Sanfilippo
7a62176b20 Merge pull request #4216 from lamby/did-not-received-typos 
Correct "did not received" -> "did not receive" typos/grammar.
 2018-08-29 16:18:11 +02:00
Salvatore Sanfilippo
bd9259d12d
Merge pull request #5282 from soloestoy/remove-duplicate-bind-in-sentinel.conf 
remove duplicate bind in sentinel.conf
 2018-08-29 16:13:42 +02:00
Salvatore Sanfilippo
b53571c526 Merge pull request #5282 from soloestoy/remove-duplicate-bind-in-sentinel.conf 
remove duplicate bind in sentinel.conf
 2018-08-29 16:13:42 +02:00
Salvatore Sanfilippo
ed5cc77ce0
Merge pull request #5296 from soloestoy/command-script-flag2 
Supplement to PR #4835, just take info/memory/command as random commands
 2018-08-29 12:26:01 +02:00
Salvatore Sanfilippo
54c7be0069 Merge pull request #5296 from soloestoy/command-script-flag2 
Supplement to PR #4835, just take info/memory/command as random commands
 2018-08-29 12:26:01 +02:00
zhaozhao.zz
7d39c149c4 Supplement to PR #4835, just take info/memory/command as random commands 2018-08-29 18:23:05 +08:00
zhaozhao.zz
a286e88109 Supplement to PR #4835, just take info/memory/command as random commands 2018-08-29 18:23:05 +08:00
Salvatore Sanfilippo
0e21efdb1c
Merge pull request #4835 from soloestoy/command-script-flag 
some commands' flags should be set correctly, issue #4834
 2018-08-29 12:13:50 +02:00
Salvatore Sanfilippo
572075e879 Merge pull request #4835 from soloestoy/command-script-flag 
some commands' flags should be set correctly, issue #4834
 2018-08-29 12:13:50 +02:00
zhaozhao.zz
32844178ac some commands' flags should be set correctly, issue #4834 2018-08-29 18:07:01 +08:00
zhaozhao.zz
a175581eb6 some commands' flags should be set correctly, issue #4834 2018-08-29 18:07:01 +08:00
Salvatore Sanfilippo
5b4bec9d33
Merge pull request #5265 from oranagra/stabilize_tests 
Fix unstable tests on slow machines.
 2018-08-27 13:19:31 +02:00
Salvatore Sanfilippo
aeb2ee7ffe Merge pull request #5265 from oranagra/stabilize_tests 
Fix unstable tests on slow machines.
 2018-08-27 13:19:31 +02:00
antirez
5941022b52 Document slave-ignore-maxmemory in redis.conf. 2018-08-27 12:34:29 +02:00
antirez
28e068244d Document slave-ignore-maxmemory in redis.conf. 2018-08-27 12:34:29 +02:00
antirez
e245a2046a Make slave-ignore-maxmemory configurable. 2018-08-27 12:27:17 +02:00
antirez
85a2a2ffa3 Make slave-ignore-maxmemory configurable. 2018-08-27 12:27:17 +02:00
antirez
067647a783 Introduce repl_slave_ignore_maxmemory flag internally. 
Note: this breaks backward compatibility with Redis 4, since now slaves
by default are exact copies of masters and do not try to evict keys
independently.
 2018-08-27 12:20:27 +02:00
antirez
b0143d81f3 Introduce repl_slave_ignore_maxmemory flag internally. 
Note: this breaks backward compatibility with Redis 4, since now slaves
by default are exact copies of masters and do not try to evict keys
independently.
 2018-08-27 12:20:27 +02:00
antirez
abf52c7cf4 Better variable meaning in processCommand(). 2018-08-27 12:17:34 +02:00
antirez
f3e6552ce0 Better variable meaning in processCommand(). 2018-08-27 12:17:34 +02:00
antirez
66b5afdaa4 Re-apply rebased #2358. 2018-08-27 12:17:14 +02:00
antirez
d38934cc1f Re-apply rebased #2358. 2018-08-27 12:17:14 +02:00
antirez
c241f51607 Fix build errors caused by #2358. 2018-08-27 12:15:55 +02:00
antirez
bcd0303571 Fix build errors caused by #2358. 2018-08-27 12:15:55 +02:00
zhaozhao.zz
e711e6f614 remove duplicate bind in sentinel.conf 2018-08-27 12:07:24 +08:00
zhaozhao.zz
f3471ba931 remove duplicate bind in sentinel.conf 2018-08-27 12:07:24 +08:00
Salvatore Sanfilippo
19880ab851
Merge pull request #5248 from soloestoy/rewrite-brpoplpush 
rewrite BRPOPLPUSH as RPOPLPUSH to propagate
 2018-08-26 16:31:24 +02:00
Salvatore Sanfilippo
22f822a340 Merge pull request #5248 from soloestoy/rewrite-brpoplpush 
rewrite BRPOPLPUSH as RPOPLPUSH to propagate
 2018-08-26 16:31:24 +02:00
Salvatore Sanfilippo
80e1695652
Merge pull request #5244 from soloestoy/optimize-pipeline 
pipeline: do not sdsrange querybuf unless all commands processed
 2018-08-26 16:30:49 +02:00
Salvatore Sanfilippo
50e6445e91 Merge pull request #5244 from soloestoy/optimize-pipeline 
pipeline: do not sdsrange querybuf unless all commands processed
 2018-08-26 16:30:49 +02:00
Chris Lamb
132be8aed5 Correct "did not received" -> "did not receive" typos/grammar. 2018-08-26 14:45:39 +02:00
Chris Lamb
b50a6304cc Correct "did not received" -> "did not receive" typos/grammar. 2018-08-26 14:45:39 +02:00
Salvatore Sanfilippo
46d89a9abb
Merge pull request #2992 from lamby/source-date-epoch 
Use SOURCE_DATE_EPOCH over unreproducible uname + date calls.
 2018-08-26 11:25:44 +02:00
Salvatore Sanfilippo
be6e41419a Merge pull request #2992 from lamby/source-date-epoch 
Use SOURCE_DATE_EPOCH over unreproducible uname + date calls.
 2018-08-26 11:25:44 +02:00
Salvatore Sanfilippo
590717782f
Merge pull request #2358 from lamby/config-set-maxmemory-grammar 
Tidy grammar in CONFIG SET maxmemory warning.
 2018-08-26 11:23:41 +02:00
Salvatore Sanfilippo
aef87bfcf7 Merge pull request #2358 from lamby/config-set-maxmemory-grammar 
Tidy grammar in CONFIG SET maxmemory warning.
 2018-08-26 11:23:41 +02:00
Salvatore Sanfilippo
8d519a85f4
Merge pull request #2292 from lamby/sentinel-conf-defaults 
Make some defaults explicit in the sentinel.conf for package maintainers
 2018-08-26 11:19:51 +02:00
Salvatore Sanfilippo
f3d723f343 Merge pull request #2292 from lamby/sentinel-conf-defaults 
Make some defaults explicit in the sentinel.conf for package maintainers
 2018-08-26 11:19:51 +02:00
Chris Lamb
f63e81c202
Merge branch 'unstable' into config-set-maxmemory-grammar 2018-08-25 21:49:29 +02:00
Chris Lamb
31e63f1ce7 Merge branch 'unstable' into config-set-maxmemory-grammar 2018-08-25 21:49:29 +02:00