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
ce25ceda
Unverified
Commit
ce25ceda
authored
Apr 28, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Apr 28, 2020
Browse files
Merge pull request #7101 from hwware/fixunusedmarco
Fix not used marco in cluster.c
parents
615eae2c
12b9fd4f
Changes
1
Show whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
ce25ceda
...
@@ -2106,7 +2106,7 @@ int clusterProcessPacket(clusterLink *link) {
...
@@ -2106,7 +2106,7 @@ int clusterProcessPacket(clusterLink *link) {
resetManualFailover
();
resetManualFailover
();
server
.
cluster
->
mf_end
=
mstime
()
+
CLUSTER_MF_TIMEOUT
;
server
.
cluster
->
mf_end
=
mstime
()
+
CLUSTER_MF_TIMEOUT
;
server
.
cluster
->
mf_slave
=
sender
;
server
.
cluster
->
mf_slave
=
sender
;
pauseClients
(
mstime
()
+
(
CLUSTER_MF_TIMEOUT
*
2
));
pauseClients
(
mstime
()
+
(
CLUSTER_MF_TIMEOUT
*
CLUSTER_MF_PAUSE_MULT
));
serverLog
(
LL_WARNING
,
"Manual failover requested by replica %.40s."
,
serverLog
(
LL_WARNING
,
"Manual failover requested by replica %.40s."
,
sender
->
name
);
sender
->
name
);
}
else
if
(
type
==
CLUSTERMSG_TYPE_UPDATE
)
{
}
else
if
(
type
==
CLUSTERMSG_TYPE_UPDATE
)
{
...
...
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