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
53201488
Commit
53201488
authored
Dec 13, 2013
by
antirez
Browse files
Sentinel: dead code removed.
parent
452dea30
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/sentinel.c
View file @
53201488
...
@@ -1638,8 +1638,6 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
...
@@ -1638,8 +1638,6 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
sds
*
lines
;
sds
*
lines
;
int
numlines
,
j
;
int
numlines
,
j
;
int
role
=
0
;
int
role
=
0
;
int
runid_changed
=
0
;
/* true if runid changed. */
int
first_runid
=
0
;
/* true if this is the first runid we receive. */
/* The following fields must be reset to a given value in the case they
/* The following fields must be reset to a given value in the case they
* are not found at all in the INFO output. */
* are not found at all in the INFO output. */
...
@@ -1655,10 +1653,8 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
...
@@ -1655,10 +1653,8 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
if
(
sdslen
(
l
)
>=
47
&&
!
memcmp
(
l
,
"run_id:"
,
7
))
{
if
(
sdslen
(
l
)
>=
47
&&
!
memcmp
(
l
,
"run_id:"
,
7
))
{
if
(
ri
->
runid
==
NULL
)
{
if
(
ri
->
runid
==
NULL
)
{
ri
->
runid
=
sdsnewlen
(
l
+
7
,
40
);
ri
->
runid
=
sdsnewlen
(
l
+
7
,
40
);
first_runid
=
1
;
}
else
{
}
else
{
if
(
strncmp
(
ri
->
runid
,
l
+
7
,
40
)
!=
0
)
{
if
(
strncmp
(
ri
->
runid
,
l
+
7
,
40
)
!=
0
)
{
runid_changed
=
1
;
sentinelEvent
(
REDIS_NOTICE
,
"+reboot"
,
ri
,
"%@"
);
sentinelEvent
(
REDIS_NOTICE
,
"+reboot"
,
ri
,
"%@"
);
sdsfree
(
ri
->
runid
);
sdsfree
(
ri
->
runid
);
ri
->
runid
=
sdsnewlen
(
l
+
7
,
40
);
ri
->
runid
=
sdsnewlen
(
l
+
7
,
40
);
...
@@ -3234,17 +3230,12 @@ void sentinelFailoverReconfNextSlave(sentinelRedisInstance *master) {
...
@@ -3234,17 +3230,12 @@ void sentinelFailoverReconfNextSlave(sentinelRedisInstance *master) {
void
sentinelFailoverSwitchToPromotedSlave
(
sentinelRedisInstance
*
master
)
{
void
sentinelFailoverSwitchToPromotedSlave
(
sentinelRedisInstance
*
master
)
{
sentinelRedisInstance
*
ref
=
master
->
promoted_slave
?
sentinelRedisInstance
*
ref
=
master
->
promoted_slave
?
master
->
promoted_slave
:
master
;
master
->
promoted_slave
:
master
;
sds
old_master_ip
;
int
old_master_port
;
sentinelEvent
(
REDIS_WARNING
,
"+switch-master"
,
master
,
"%s %s %d %s %d"
,
sentinelEvent
(
REDIS_WARNING
,
"+switch-master"
,
master
,
"%s %s %d %s %d"
,
master
->
name
,
master
->
addr
->
ip
,
master
->
addr
->
port
,
master
->
name
,
master
->
addr
->
ip
,
master
->
addr
->
port
,
ref
->
addr
->
ip
,
ref
->
addr
->
port
);
ref
->
addr
->
ip
,
ref
->
addr
->
port
);
old_master_ip
=
sdsdup
(
master
->
addr
->
ip
);
old_master_port
=
master
->
addr
->
port
;
sentinelResetMasterAndChangeAddress
(
master
,
ref
->
addr
->
ip
,
ref
->
addr
->
port
);
sentinelResetMasterAndChangeAddress
(
master
,
ref
->
addr
->
ip
,
ref
->
addr
->
port
);
sdsfree
(
old_master_ip
);
}
}
void
sentinelFailoverStateMachine
(
sentinelRedisInstance
*
ri
)
{
void
sentinelFailoverStateMachine
(
sentinelRedisInstance
*
ri
)
{
...
...
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