Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
3a16ad30
Unverified
Commit
3a16ad30
authored
Aug 19, 2022
by
Binbin
Committed by
GitHub
Aug 18, 2022
Browse files
Fix CLUSTERDOWN issue in cluster reshard unblock test (#11139)
change the cluster-node-timeout from 1 to 1000
parent
223046ec
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
3a16ad30
...
@@ -6929,8 +6929,8 @@ int clusterRedirectBlockedClientIfNeeded(client *c) {
...
@@ -6929,8 +6929,8 @@ int clusterRedirectBlockedClientIfNeeded(client *c) {
return 1;
return 1;
}
}
/* If the client is blocked on module, but
o
nt on a specific key,
/* If the client is blocked on module, but n
o
t on a specific key,
* don't unblock it (except for the CL
S
UTER_FAIL case above). */
* don't unblock it (except for the CLU
S
TER_FAIL case above). */
if (c->btype == BLOCKED_MODULE && !moduleClientIsBlockedOnKeys(c))
if (c->btype == BLOCKED_MODULE && !moduleClientIsBlockedOnKeys(c))
return 0;
return 0;
...
...
tests/unit/cluster/cli.tcl
View file @
3a16ad30
...
@@ -10,7 +10,7 @@ set ::singledb 1
...
@@ -10,7 +10,7 @@ set ::singledb 1
tags
{
tls:skip external:skip cluster
}
{
tags
{
tls:skip external:skip cluster
}
{
# start three servers
# start three servers
set base_conf
[
list cluster-enabled yes cluster-node-timeout 1
]
set base_conf
[
list cluster-enabled yes cluster-node-timeout 1
000
]
start_multiple_servers 3
[
list overrides $base_conf
]
{
start_multiple_servers 3
[
list overrides $base_conf
]
{
set node1
[
srv 0 client
]
set node1
[
srv 0 client
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment