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
5450833d
Commit
5450833d
authored
Nov 19, 2013
by
antirez
Browse files
Sentinel: arity of known-sentinel/slave is 4 not 3.
parent
b8a94463
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/sentinel.c
View file @
5450833d
...
@@ -1309,7 +1309,7 @@ char *sentinelHandleConfiguration(char **argv, int argc) {
...
@@ -1309,7 +1309,7 @@ char *sentinelHandleConfiguration(char **argv, int argc) {
ri
->
config_epoch
=
strtoull
(
argv
[
2
],
NULL
,
10
);
ri
->
config_epoch
=
strtoull
(
argv
[
2
],
NULL
,
10
);
if
(
ri
->
config_epoch
>
sentinel
.
current_epoch
)
if
(
ri
->
config_epoch
>
sentinel
.
current_epoch
)
sentinel
.
current_epoch
=
ri
->
config_epoch
;
sentinel
.
current_epoch
=
ri
->
config_epoch
;
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"known-slave"
)
&&
argc
==
3
)
{
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"known-slave"
)
&&
argc
==
4
)
{
sentinelRedisInstance
*
slave
;
sentinelRedisInstance
*
slave
;
/* known-slave <name> <ip> <port> */
/* known-slave <name> <ip> <port> */
...
@@ -1320,7 +1320,7 @@ char *sentinelHandleConfiguration(char **argv, int argc) {
...
@@ -1320,7 +1320,7 @@ char *sentinelHandleConfiguration(char **argv, int argc) {
{
{
return
"Wrong hostname or port for slave."
;
return
"Wrong hostname or port for slave."
;
}
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"known-sentinel"
)
&&
argc
==
3
)
{
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"known-sentinel"
)
&&
argc
==
4
)
{
sentinelRedisInstance
*
si
;
sentinelRedisInstance
*
si
;
/* known-sentinel <name> <ip> <port> */
/* known-sentinel <name> <ip> <port> */
...
...
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