antirez
ae2bcd49db
Update comment to clarify change in #7398 .
...
(cherry picked from commit 7bb0342201 )
2020-07-20 21:08:26 +03:00
antirez
14a59d4ce7
Update comment to clarify change in #7398 .
...
(cherry picked from commit ad0a9df77a )
2020-07-20 21:08:26 +03:00
antirez
ecb2743e8a
LPOS: option FIRST renamed RANK.
...
(cherry picked from commit 5b16c2f174 )
2020-07-20 21:08:26 +03:00
antirez
17aaf5ec97
LPOS: option FIRST renamed RANK.
...
(cherry picked from commit a5a3a7bbc6 )
2020-07-20 21:08:26 +03:00
antirez
63073e6a44
Include cluster.h for getClusterConnectionsCount().
...
(cherry picked from commit 79e15d1686 )
2020-07-20 21:08:26 +03:00
antirez
c8f250f8dd
Include cluster.h for getClusterConnectionsCount().
...
(cherry picked from commit 21f62c3346 )
2020-07-20 21:08:26 +03:00
antirez
5f889001cf
Fix BITFIELD i64 type handling, see #7417 .
...
(cherry picked from commit 448a8bb0ed )
2020-07-20 21:08:26 +03:00
antirez
9412094f25
Fix BITFIELD i64 type handling, see #7417 .
...
(cherry picked from commit 746297314f )
2020-07-20 21:08:26 +03:00
antirez
93fa64f65a
Clarify maxclients and cluster in conf. Remove myself too.
...
(cherry picked from commit c10a7a040f )
2020-07-20 21:08:26 +03:00
antirez
8312aa27d4
Clarify maxclients and cluster in conf. Remove myself too.
...
(cherry picked from commit 59fd178014 )
2020-07-20 21:08:26 +03:00
antirez
7412dbbef5
Use cluster connections too, to limit maxclients.
...
See #7401 .
(cherry picked from commit fc08cafdb0 )
2020-07-20 21:08:26 +03:00
antirez
0ebbc36059
Use cluster connections too, to limit maxclients.
...
See #7401 .
(cherry picked from commit 4b8d8826af )
2020-07-20 21:08:26 +03:00
antirez
d5515331e2
Tracking: fix enableBcastTrackingForPrefix() invalid sdslen() call.
...
Related to #7387 .
(cherry picked from commit ae770c3034 )
2020-07-20 21:08:26 +03:00
antirez
43ed3c3589
Tracking: fix enableBcastTrackingForPrefix() invalid sdslen() call.
...
Related to #7387 .
(cherry picked from commit 784479939d )
2020-07-20 21:08:26 +03:00
antirez
9d3e874179
Fix LCS object type checking. Related to #7379 .
...
(cherry picked from commit 00e1f87a08 )
2020-07-20 21:08:26 +03:00
antirez
82b2bfd20b
Fix LCS object type checking. Related to #7379 .
...
(cherry picked from commit 1055398849 )
2020-07-20 21:08:26 +03:00
antirez
7bb0342201
Update comment to clarify change in #7398 .
2020-06-25 12:58:21 +02:00
antirez
ad0a9df77a
Update comment to clarify change in #7398 .
2020-06-25 12:58:21 +02:00
Salvatore Sanfilippo
339fb2de8d
Merge pull request #7398 from caiyuxinggg/work
...
cluster.c remove "if (nodeIsMaster(myself))" judgement before clusterSendFail in markNodeAsFailingIfNeeded, avoiding slave failover requires twice vote requests
2020-06-25 12:56:26 +02:00
Salvatore Sanfilippo
760021e677
Merge pull request #7398 from caiyuxinggg/work
...
cluster.c remove "if (nodeIsMaster(myself))" judgement before clusterSendFail in markNodeAsFailingIfNeeded, avoiding slave failover requires twice vote requests
2020-06-25 12:56:26 +02:00
Salvatore Sanfilippo
03ab78d115
Merge pull request #7426 from dnielsen/patch-1
...
updated copyright year to 2020
2020-06-25 12:36:37 +02:00
Salvatore Sanfilippo
b2c86acd0a
Merge pull request #7426 from dnielsen/patch-1
...
updated copyright year to 2020
2020-06-25 12:36:37 +02:00
antirez
e2f5953c73
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2020-06-24 09:09:59 +02:00
antirez
959cdb358b
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2020-06-24 09:09:59 +02:00
antirez
5b16c2f174
LPOS: option FIRST renamed RANK.
2020-06-24 09:09:43 +02:00
antirez
a5a3a7bbc6
LPOS: option FIRST renamed RANK.
2020-06-24 09:09:43 +02:00
Salvatore Sanfilippo
54a422f6e0
Merge pull request #7390 from oranagra/exec_fails_abort
...
EXEC always fails with EXECABORT and multi-state is cleared
2020-06-23 13:12:52 +02:00
Salvatore Sanfilippo
6bbbdd26f4
Merge pull request #7390 from oranagra/exec_fails_abort
...
EXEC always fails with EXECABORT and multi-state is cleared
2020-06-23 13:12:52 +02:00
antirez
79e15d1686
Include cluster.h for getClusterConnectionsCount().
2020-06-22 11:44:11 +02:00
antirez
21f62c3346
Include cluster.h for getClusterConnectionsCount().
2020-06-22 11:44:11 +02:00
antirez
448a8bb0ed
Fix BITFIELD i64 type handling, see #7417 .
2020-06-22 11:41:19 +02:00
antirez
746297314f
Fix BITFIELD i64 type handling, see #7417 .
2020-06-22 11:41:19 +02:00
antirez
c10a7a040f
Clarify maxclients and cluster in conf. Remove myself too.
2020-06-22 11:21:21 +02:00
antirez
59fd178014
Clarify maxclients and cluster in conf. Remove myself too.
2020-06-22 11:21:21 +02:00
Salvatore Sanfilippo
4d45ec35b2
Merge pull request #7421 from hwware/sentinel_leak_fix
...
fix memory leak in sentinel connection sharing
2020-06-22 11:06:50 +02:00
Salvatore Sanfilippo
42fd522c63
Merge pull request #7421 from hwware/sentinel_leak_fix
...
fix memory leak in sentinel connection sharing
2020-06-22 11:06:50 +02:00
Salvatore Sanfilippo
bf12f73224
Merge pull request #7402 from chenhui0212/unstable
...
Fix comments in listpack.c
2020-06-18 11:29:06 +02:00
Salvatore Sanfilippo
5e46e0800b
Merge pull request #7402 from chenhui0212/unstable
...
Fix comments in listpack.c
2020-06-18 11:29:06 +02:00
Salvatore Sanfilippo
66657b0001
Merge pull request #7411 from tporadowski/inconsitent-sentinel-nosave
...
Inconsistent RDB saving when in Sentinel mode
2020-06-18 11:26:53 +02:00
Salvatore Sanfilippo
ab4cc1e11b
Merge pull request #7411 from tporadowski/inconsitent-sentinel-nosave
...
Inconsistent RDB saving when in Sentinel mode
2020-06-18 11:26:53 +02:00
antirez
fc08cafdb0
Use cluster connections too, to limit maxclients.
...
See #7401 .
2020-06-16 11:45:11 +02:00
antirez
4b8d8826af
Use cluster connections too, to limit maxclients.
...
See #7401 .
2020-06-16 11:45:11 +02:00
antirez
714c2be383
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2020-06-16 11:11:01 +02:00
antirez
62fc7f4f24
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2020-06-16 11:11:01 +02:00
antirez
ae770c3034
Tracking: fix enableBcastTrackingForPrefix() invalid sdslen() call.
...
Related to #7387 .
2020-06-16 11:09:48 +02:00
antirez
784479939d
Tracking: fix enableBcastTrackingForPrefix() invalid sdslen() call.
...
Related to #7387 .
2020-06-16 11:09:48 +02:00
Salvatore Sanfilippo
96ca6e9f5d
Merge pull request #7396 from MeirShpilraien/fix_dict_scan_module_api
...
Fix RM_ScanKey module api not to return int encoded strings
2020-06-15 10:43:33 +02:00
Salvatore Sanfilippo
6ce2ed870d
Merge pull request #7396 from MeirShpilraien/fix_dict_scan_module_api
...
Fix RM_ScanKey module api not to return int encoded strings
2020-06-15 10:43:33 +02:00
antirez
00e1f87a08
Fix LCS object type checking. Related to #7379 .
2020-06-12 12:43:40 +02:00
antirez
1055398849
Fix LCS object type checking. Related to #7379 .
2020-06-12 12:43:40 +02:00
Salvatore Sanfilippo
c35a814c4f
Merge pull request #7375 from hwware/lcs_crash_fix
...
Fix Server Crash in LCS Command
2020-06-12 12:31:15 +02:00
Salvatore Sanfilippo
a66298e6f1
Merge pull request #7375 from hwware/lcs_crash_fix
...
Fix Server Crash in LCS Command
2020-06-12 12:31:15 +02:00
antirez
d05cc51e4e
help.h updated.
2020-06-12 12:16:24 +02:00
antirez
0cae0900cf
help.h updated.
2020-06-12 12:16:24 +02:00
antirez
f66fc18807
help.h updated.
2020-06-12 12:16:19 +02:00
antirez
ca58198a76
help.h updated.
2020-06-12 12:16:19 +02:00
antirez
3dc6657ea8
LPOS: tests + crash fix.
2020-06-12 12:08:06 +02:00
antirez
e0022d8cfe
LPOS: tests + crash fix.
2020-06-12 12:08:06 +02:00
antirez
010dd2b320
LPOS: update to latest proposal.
...
See https://gist.github.com/antirez/3591c5096bc79cad8b5a992e08304f48
2020-06-12 12:08:06 +02:00
antirez
495327c020
LPOS: update to latest proposal.
...
See https://gist.github.com/antirez/3591c5096bc79cad8b5a992e08304f48
2020-06-12 12:08:06 +02:00
antirez
00e400ed66
LPOS: implement the final design.
2020-06-12 12:08:06 +02:00
antirez
afb8b3c030
LPOS: implement the final design.
2020-06-12 12:08:06 +02:00
antirez
b7db223637
LPOS: tests + crash fix.
2020-06-11 12:39:06 +02:00
antirez
0091125cae
LPOS: tests + crash fix.
2020-06-11 12:39:06 +02:00
antirez
336e8a7fa2
LPOS: update to latest proposal.
...
See https://gist.github.com/antirez/3591c5096bc79cad8b5a992e08304f48
2020-06-11 11:18:20 +02:00
antirez
89ca2afd6b
LPOS: update to latest proposal.
...
See https://gist.github.com/antirez/3591c5096bc79cad8b5a992e08304f48
2020-06-11 11:18:20 +02:00
antirez
5766a69a41
LPOS: implement the final design.
2020-06-10 12:49:15 +02:00
antirez
e63a5ba122
LPOS: implement the final design.
2020-06-10 12:49:15 +02:00
antirez
ce8f107a5e
Redis 6.0.5.
2020-06-09 12:19:30 +02:00
antirez
51efb7fe25
Redis 6.0.5.
2020-06-09 12:19:30 +02:00
antirez
93e76ba456
Adapt EVAL+busy script test to new behavior.
2020-06-09 12:19:30 +02:00
antirez
a7d3670da5
Adapt EVAL+busy script test to new behavior.
2020-06-09 12:19:30 +02:00
antirez
5d1b27f4f9
Adapt EVAL+busy script test to new behavior.
2020-06-09 12:19:14 +02:00
antirez
2ebcd63d6a
Adapt EVAL+busy script test to new behavior.
2020-06-09 12:19:14 +02:00
antirez
e819e3ee26
Temporary fix for #7353 issue about EVAL during -BUSY.
2020-06-09 11:53:01 +02:00
antirez
ee8dd01bbc
Temporary fix for #7353 issue about EVAL during -BUSY.
2020-06-09 11:53:01 +02:00
antirez
e286d3b4b6
Temporary fix for #7353 issue about EVAL during -BUSY.
2020-06-09 11:52:33 +02:00
antirez
cdad0e6485
Temporary fix for #7353 issue about EVAL during -BUSY.
2020-06-09 11:52:33 +02:00
Salvatore Sanfilippo
37b318c7e0
Merge pull request #7363 from xhebox/unstable
...
return the correct proto version
2020-06-08 12:54:15 +02:00
Salvatore Sanfilippo
48b2915c18
Merge pull request #7363 from xhebox/unstable
...
return the correct proto version
2020-06-08 12:54:15 +02:00
Salvatore Sanfilippo
5f1defa179
Merge pull request #7370 from oranagra/no_queue_in_aborted_multi
...
Don't queue commands in an already aborted MULTI state
2020-06-08 11:08:08 +02:00
Salvatore Sanfilippo
254f06c131
Merge pull request #7370 from oranagra/no_queue_in_aborted_multi
...
Don't queue commands in an already aborted MULTI state
2020-06-08 11:08:08 +02:00
Salvatore Sanfilippo
783735c915
Merge pull request #7369 from oranagra/no_reject_watch
...
Avoid rejecting WATCH / UNWATCH, like MULTI/EXEC/DISCARD
2020-06-08 11:04:26 +02:00
Salvatore Sanfilippo
8183a4ca7f
Merge pull request #7369 from oranagra/no_reject_watch
...
Avoid rejecting WATCH / UNWATCH, like MULTI/EXEC/DISCARD
2020-06-08 11:04:26 +02:00
Salvatore Sanfilippo
0c539f6497
Merge pull request #7357 from soloestoy/bugfix-aof-keepttl
...
AOF: append origin SET if no expire option
2020-06-08 11:02:00 +02:00
Salvatore Sanfilippo
265a7e7ec7
Merge pull request #7357 from soloestoy/bugfix-aof-keepttl
...
AOF: append origin SET if no expire option
2020-06-08 11:02:00 +02:00
Salvatore Sanfilippo
6fed3d8708
Merge pull request #7371 from oranagra/fix_disconnectSlaves
...
fix disconnectSlaves, to try to free each slave.
2020-06-08 10:43:51 +02:00
Salvatore Sanfilippo
cfffda83fb
Merge pull request #7371 from oranagra/fix_disconnectSlaves
...
fix disconnectSlaves, to try to free each slave.
2020-06-08 10:43:51 +02:00
Salvatore Sanfilippo
4ea93c04ff
Merge pull request #7352 from soloestoy/donot-free-protected-client-when-blocking
...
donot free protected client in freeClientsInAsyncFreeQueue()
2020-06-08 10:43:17 +02:00
Salvatore Sanfilippo
74a203a050
Merge pull request #7352 from soloestoy/donot-free-protected-client-when-blocking
...
donot free protected client in freeClientsInAsyncFreeQueue()
2020-06-08 10:43:17 +02:00
antirez
5fe90c04a1
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2020-06-06 11:44:05 +02:00
antirez
44b76a75d2
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2020-06-06 11:44:05 +02:00
antirez
bec1ac9899
Revert "Implements sendfile for redis."
...
This reverts commit 5675053269 .
2020-06-06 11:43:29 +02:00
antirez
329fddbda1
Revert "Implements sendfile for redis."
...
This reverts commit 9cf500a3f6 .
2020-06-06 11:43:29 +02:00
antirez
8bfdba1e08
Revert "avoid using sendfile if tls-replication is enabled"
...
This reverts commit 13bbd165e8 .
2020-06-06 11:43:29 +02:00
antirez
925a2cd5aa
Revert "avoid using sendfile if tls-replication is enabled"
...
This reverts commit b9abecfc4c .
2020-06-06 11:43:29 +02:00
antirez
a5f0fa7f7a
Fix handling of special chars in ACL LOAD.
...
Now it is also possible for ACL SETUSER to accept empty strings
as valid operations (doing nothing), so for instance
ACL SETUSER myuser ""
Will have just the effect of creating a user in the default state.
This should fix #7329 .
2020-06-06 11:43:29 +02:00
antirez
cd63359a17
Fix handling of special chars in ACL LOAD.
...
Now it is also possible for ACL SETUSER to accept empty strings
as valid operations (doing nothing), so for instance
ACL SETUSER myuser ""
Will have just the effect of creating a user in the default state.
This should fix #7329 .
2020-06-06 11:43:29 +02:00
antirez
8b15ba933d
Revert "Implements sendfile for redis."
...
This reverts commit 5675053269 .
2020-06-06 11:42:45 +02:00
antirez
61074b43a6
Revert "Implements sendfile for redis."
...
This reverts commit 9cf500a3f6 .
2020-06-06 11:42:45 +02:00