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
557222d1
Unverified
Commit
557222d1
authored
Mar 20, 2022
by
Madelyn Olson
Committed by
GitHub
Mar 20, 2022
Browse files
Fix timing issue in shards test and fix displayed TLS port (#10450)
parent
fae5b1a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
557222d1
...
...
@@ -4972,14 +4972,16 @@ void addNodeDetailsToShardReply(client *c, clusterNode *node) {
addReplyBulkCBuffer
(
c
,
node
->
name
,
CLUSTER_NAMELEN
);
reply_count
++
;
int
port
=
server
.
cluster_announce_port
?
server
.
cluster_announce_port
:
server
.
port
;
if
(
port
)
{
/* We use server.tls_cluster as a proxy for whether or not
* the remote port is the tls port or not */
int
plaintext_port
=
server
.
tls_cluster
?
node
->
pport
:
node
->
port
;
int
tls_port
=
server
.
tls_cluster
?
node
->
port
:
0
;
if
(
plaintext_port
)
{
addReplyBulkCString
(
c
,
"port"
);
addReplyLongLong
(
c
,
node
->
port
);
addReplyLongLong
(
c
,
plaintext_
port
);
reply_count
++
;
}
int
tls_port
=
server
.
cluster_announce_tls_port
?
server
.
cluster_announce_tls_port
:
server
.
tls_port
;
if
(
tls_port
)
{
addReplyBulkCString
(
c
,
"tls-port"
);
addReplyLongLong
(
c
,
tls_port
);
...
...
tests/cluster/tests/28-cluster-shards.tcl
View file @
557222d1
...
...
@@ -131,7 +131,7 @@ test "Instance #0 gets converted into a replica" {
test
"Test the replica reports a loading state while it's loading"
{
# Test the command is good for verifying everything moves to a happy state
set replica_cluster_id
[
R $replica_id CLUSTER MYID
]
wait_for_condition 50 100
{
wait_for_condition 50 100
0
{
[
dict get
[
get_node_info_from_shard $replica_cluster_id $primary_id
"node"
]
health
]
eq
"online"
}
else
{
fail
"Replica never transitioned to online"
...
...
@@ -165,7 +165,7 @@ test "Test the replica reports a loading state while it's loading" {
R $primary_id exec
# The replica should reconnect and start a full sync, it will gossip about it's health to the primary.
wait_for_condition 50 100
{
wait_for_condition 50 100
0
{
"loading"
eq
[
dict get
[
get_node_info_from_shard $replica_cluster_id $primary_id
"node"
]
health
]
}
else
{
fail
"Replica never transitioned to loading"
...
...
@@ -174,7 +174,7 @@ test "Test the replica reports a loading state while it's loading" {
# Speed up the key loading and verify everything resumes
R $replica_id config set key-load-delay 0
wait_for_condition 50 100
{
wait_for_condition 50 100
0
{
"online"
eq
[
dict get
[
get_node_info_from_shard $replica_cluster_id $primary_id
"node"
]
health
]
}
else
{
fail
"Replica never transitioned to online"
...
...
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