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
fe5aea38
Commit
fe5aea38
authored
Nov 19, 2019
by
antirez
Browse files
Simplify PR #6551 implementation.
parent
065872e0
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/sentinel.c
View file @
fe5aea38
...
...
@@ -465,12 +465,6 @@ struct redisCommand sentinelcmds[] = {
{
"hello"
,
helloCommand
,
-
2
,
"no-script fast"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
}
};
/* List of client types that are killed when an instance becomes a slave */
const
char
*
killedClientTypes
[]
=
{
"normal"
,
"pubsub"
};
/* This function overwrites a few normal Redis config default with Sentinel
* specific defaults. */
void
initSentinelConfig
(
void
)
{
...
...
@@ -3955,7 +3949,6 @@ char *sentinelGetLeader(sentinelRedisInstance *master, uint64_t epoch) {
int
sentinelSendSlaveOf
(
sentinelRedisInstance
*
ri
,
char
*
host
,
int
port
)
{
char
portstr
[
32
];
int
retval
;
unsigned
int
curType
;
ll2string
(
portstr
,
sizeof
(
portstr
),
port
);
...
...
@@ -4000,11 +3993,11 @@ int sentinelSendSlaveOf(sentinelRedisInstance *ri, char *host, int port) {
* an issue because CLIENT is variadic command, so Redis will not
* recognized as a syntax error, and the transaction will not fail (but
* only the unsupported command will fail). */
for
(
curT
ype
=
0
;
curT
ype
<
sizeof
(
killedClientTypes
)
/
sizeof
(
killedClientTypes
[
0
]);
++
curType
)
{
for
(
int
t
ype
=
0
;
t
ype
<
2
;
type
++
)
{
retval
=
redisAsyncCommand
(
ri
->
link
->
cc
,
sentinelDiscardReplyCallback
,
ri
,
"%s KILL TYPE %s"
,
sentinelInstanceMapCommand
(
ri
,
"CLIENT"
),
killedClientTypes
[
curType
]
);
type
==
0
?
"normal"
:
"pubsub"
);
if
(
retval
==
C_ERR
)
return
retval
;
ri
->
link
->
pending_commands
++
;
}
...
...
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