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
72f07519
Unverified
Commit
72f07519
authored
Apr 23, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Apr 23, 2020
Browse files
Merge pull request #7123 from fayadexinqing/optimizeClusterSlots
Optimize the command of cluster slots
parents
12cd67b7
6b547c39
Changes
2
Show whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
72f07519
...
@@ -4191,11 +4191,17 @@ void clusterReplyMultiBulkSlots(client *c) {
...
@@ -4191,11 +4191,17 @@ void clusterReplyMultiBulkSlots(client *c) {
while
((
de
=
dictNext
(
di
))
!=
NULL
)
{
while
((
de
=
dictNext
(
di
))
!=
NULL
)
{
clusterNode
*
node
=
dictGetVal
(
de
);
clusterNode
*
node
=
dictGetVal
(
de
);
int
j
=
0
,
start
=
-
1
;
int
j
=
0
,
start
=
-
1
;
int
i
,
nested_elements
=
0
;
/* Skip slaves (that are iterated when producing the output of their
/* Skip slaves (that are iterated when producing the output of their
* master) and masters not serving any slot. */
* master) and masters not serving any slot. */
if
(
!
nodeIsMaster
(
node
)
||
node
->
numslots
==
0
)
continue
;
if
(
!
nodeIsMaster
(
node
)
||
node
->
numslots
==
0
)
continue
;
for
(
i
=
0
;
i
<
node
->
numslaves
;
i
++
)
{
if
(
nodeFailed
(
node
->
slaves
[
i
]))
continue
;
nested_elements
++
;
}
for
(
j
=
0
;
j
<
CLUSTER_SLOTS
;
j
++
)
{
for
(
j
=
0
;
j
<
CLUSTER_SLOTS
;
j
++
)
{
int
bit
,
i
;
int
bit
,
i
;
...
@@ -4203,8 +4209,7 @@ void clusterReplyMultiBulkSlots(client *c) {
...
@@ -4203,8 +4209,7 @@ void clusterReplyMultiBulkSlots(client *c) {
if
(
start
==
-
1
)
start
=
j
;
if
(
start
==
-
1
)
start
=
j
;
}
}
if
(
start
!=
-
1
&&
(
!
bit
||
j
==
CLUSTER_SLOTS
-
1
))
{
if
(
start
!=
-
1
&&
(
!
bit
||
j
==
CLUSTER_SLOTS
-
1
))
{
int
nested_elements
=
3
;
/* slots (2) + master addr (1). */
addReplyArrayLen
(
c
,
nested_elements
+
3
);
/* slots (2) + master addr (1). */
void
*
nested_replylen
=
addReplyDeferredLen
(
c
);
if
(
bit
&&
j
==
CLUSTER_SLOTS
-
1
)
j
++
;
if
(
bit
&&
j
==
CLUSTER_SLOTS
-
1
)
j
++
;
...
@@ -4234,9 +4239,7 @@ void clusterReplyMultiBulkSlots(client *c) {
...
@@ -4234,9 +4239,7 @@ void clusterReplyMultiBulkSlots(client *c) {
addReplyBulkCString
(
c
,
node
->
slaves
[
i
]
->
ip
);
addReplyBulkCString
(
c
,
node
->
slaves
[
i
]
->
ip
);
addReplyLongLong
(
c
,
node
->
slaves
[
i
]
->
port
);
addReplyLongLong
(
c
,
node
->
slaves
[
i
]
->
port
);
addReplyBulkCBuffer
(
c
,
node
->
slaves
[
i
]
->
name
,
CLUSTER_NAMELEN
);
addReplyBulkCBuffer
(
c
,
node
->
slaves
[
i
]
->
name
,
CLUSTER_NAMELEN
);
nested_elements
++
;
}
}
setDeferredArrayLen
(
c
,
nested_replylen
,
nested_elements
);
num_masters
++
;
num_masters
++
;
}
}
}
}
...
...
tests/cluster/tests/15-cluster-slots.tcl
0 → 100644
View file @
72f07519
source
"../tests/includes/init-tests.tcl"
proc cluster_allocate_mixedSlots
{
n
}
{
set slot 16383
while
{
$slot
>= 0
}
{
set node
[
expr
{
$slot
% $n
}]
lappend slots_$node $slot
incr slot -1
}
for
{
set j 0
}
{
$j
< $n
}
{
incr j
}
{
R $j cluster addslots
{*}
[
set slots_$
{
j
}]
}
}
proc create_cluster_with_mixedSlot
{
masters slaves
}
{
cluster_allocate_mixedSlots $masters
if
{
$slaves
}
{
cluster_allocate_slaves $masters $slaves
}
assert_cluster_state ok
}
test
"Create a 5 nodes cluster"
{
create_cluster_with_mixedSlot 5 15
}
test
"Cluster is up"
{
assert_cluster_state ok
}
test
"Cluster is writable"
{
cluster_write_test 0
}
test
"Instance #5 is a slave"
{
assert
{[
RI 5 role
]
eq
{
slave
}}
}
test
"client do not break when cluster slot"
{
R 0 config set client-output-buffer-limit
"normal 33554432 16777216 60"
if
{
[
catch
{
R 0 cluster slots
}]
}
{
fail
"output overflow when cluster slots"
}
}
\ No newline at end of file
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