Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
6d2fddd2
Commit
6d2fddd2
authored
May 20, 2014
by
antirez
Browse files
Remove trailing spaces from sentinel.c.
parent
ad935769
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/sentinel.c
View file @
6d2fddd2
...
@@ -493,7 +493,7 @@ int sentinelAddrIsEqual(sentinelAddr *a, sentinelAddr *b) {
...
@@ -493,7 +493,7 @@ int sentinelAddrIsEqual(sentinelAddr *a, sentinelAddr *b) {
/* =========================== Events notification ========================== */
/* =========================== Events notification ========================== */
/* Send an event to log, pub/sub, user notification script.
/* Send an event to log, pub/sub, user notification script.
*
*
* 'level' is the log level for logging. Only REDIS_WARNING events will trigger
* 'level' is the log level for logging. Only REDIS_WARNING events will trigger
* the execution of the user notification script.
* the execution of the user notification script.
*
*
...
@@ -616,7 +616,7 @@ void sentinelScheduleScriptExecution(char *path, ...) {
...
@@ -616,7 +616,7 @@ void sentinelScheduleScriptExecution(char *path, ...) {
}
}
va_end
(
ap
);
va_end
(
ap
);
argv
[
0
]
=
sdsnew
(
path
);
argv
[
0
]
=
sdsnew
(
path
);
sj
=
zmalloc
(
sizeof
(
*
sj
));
sj
=
zmalloc
(
sizeof
(
*
sj
));
sj
->
flags
=
SENTINEL_SCRIPT_NONE
;
sj
->
flags
=
SENTINEL_SCRIPT_NONE
;
sj
->
retry_num
=
0
;
sj
->
retry_num
=
0
;
...
@@ -742,7 +742,7 @@ void sentinelCollectTerminatedScripts(void) {
...
@@ -742,7 +742,7 @@ void sentinelCollectTerminatedScripts(void) {
if
(
WIFSIGNALED
(
statloc
))
bysignal
=
WTERMSIG
(
statloc
);
if
(
WIFSIGNALED
(
statloc
))
bysignal
=
WTERMSIG
(
statloc
);
sentinelEvent
(
REDIS_DEBUG
,
"-script-child"
,
NULL
,
"%ld %d %d"
,
sentinelEvent
(
REDIS_DEBUG
,
"-script-child"
,
NULL
,
"%ld %d %d"
,
(
long
)
pid
,
exitcode
,
bysignal
);
(
long
)
pid
,
exitcode
,
bysignal
);
ln
=
sentinelGetScriptListNodeByPid
(
pid
);
ln
=
sentinelGetScriptListNodeByPid
(
pid
);
if
(
ln
==
NULL
)
{
if
(
ln
==
NULL
)
{
redisLog
(
REDIS_WARNING
,
"wait3() returned a pid (%ld) we can't find in our scripts execution queue!"
,
(
long
)
pid
);
redisLog
(
REDIS_WARNING
,
"wait3() returned a pid (%ld) we can't find in our scripts execution queue!"
,
(
long
)
pid
);
...
@@ -1020,7 +1020,7 @@ sentinelRedisInstance *sentinelRedisInstanceLookupSlave(
...
@@ -1020,7 +1020,7 @@ sentinelRedisInstance *sentinelRedisInstanceLookupSlave(
{
{
sds
key
;
sds
key
;
sentinelRedisInstance
*
slave
;
sentinelRedisInstance
*
slave
;
redisAssert
(
ri
->
flags
&
SRI_MASTER
);
redisAssert
(
ri
->
flags
&
SRI_MASTER
);
key
=
sdscatprintf
(
sdsempty
(),
key
=
sdscatprintf
(
sdsempty
(),
strchr
(
ip
,
':'
)
?
"[%s]:%d"
:
"%s:%d"
,
strchr
(
ip
,
':'
)
?
"[%s]:%d"
:
"%s:%d"
,
...
@@ -1040,7 +1040,7 @@ const char *sentinelRedisInstanceTypeStr(sentinelRedisInstance *ri) {
...
@@ -1040,7 +1040,7 @@ const char *sentinelRedisInstanceTypeStr(sentinelRedisInstance *ri) {
/* This function removes all the instances found in the dictionary of
/* This function removes all the instances found in the dictionary of
* sentinels in the specified 'master', having either:
* sentinels in the specified 'master', having either:
*
*
* 1) The same ip/port as specified.
* 1) The same ip/port as specified.
* 2) The same runid.
* 2) The same runid.
*
*
...
@@ -1234,7 +1234,7 @@ int sentinelResetMasterAndChangeAddress(sentinelRedisInstance *master, char *ip,
...
@@ -1234,7 +1234,7 @@ int sentinelResetMasterAndChangeAddress(sentinelRedisInstance *master, char *ip,
slave
->
addr
->
port
);
slave
->
addr
->
port
);
}
}
dictReleaseIterator
(
di
);
dictReleaseIterator
(
di
);
/* If we are switching to a different address, include the old address
/* If we are switching to a different address, include the old address
* as a slave as well, so that we'll be able to sense / reconfigure
* as a slave as well, so that we'll be able to sense / reconfigure
* the old master. */
* the old master. */
...
@@ -1847,7 +1847,7 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
...
@@ -1847,7 +1847,7 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
ri
->
slave_conf_change_time
=
mstime
();
ri
->
slave_conf_change_time
=
mstime
();
}
}
}
}
/* master_link_status:<status> */
/* master_link_status:<status> */
if
(
sdslen
(
l
)
>=
19
&&
!
memcmp
(
l
,
"master_link_status:"
,
19
))
{
if
(
sdslen
(
l
)
>=
19
&&
!
memcmp
(
l
,
"master_link_status:"
,
19
))
{
ri
->
slave_master_link_status
=
ri
->
slave_master_link_status
=
...
@@ -2168,7 +2168,7 @@ void sentinelReceiveHelloMessages(redisAsyncContext *c, void *reply, void *privd
...
@@ -2168,7 +2168,7 @@ void sentinelReceiveHelloMessages(redisAsyncContext *c, void *reply, void *privd
* receive our messages as well this timestamp can be used to detect
* receive our messages as well this timestamp can be used to detect
* if the link is probably disconnected even if it seems otherwise. */
* if the link is probably disconnected even if it seems otherwise. */
ri
->
pc_last_activity
=
mstime
();
ri
->
pc_last_activity
=
mstime
();
/* Sanity check in the reply we expect, so that the code that follows
/* Sanity check in the reply we expect, so that the code that follows
* can avoid to check for details. */
* can avoid to check for details. */
if
(
r
->
type
!=
REDIS_REPLY_ARRAY
||
if
(
r
->
type
!=
REDIS_REPLY_ARRAY
||
...
@@ -3241,7 +3241,7 @@ void sentinelStartFailover(sentinelRedisInstance *master) {
...
@@ -3241,7 +3241,7 @@ void sentinelStartFailover(sentinelRedisInstance *master) {
* 1) Master must be in ODOWN condition.
* 1) Master must be in ODOWN condition.
* 2) No failover already in progress.
* 2) No failover already in progress.
* 3) No failover already attempted recently.
* 3) No failover already attempted recently.
*
*
* We still don't know if we'll win the election so it is possible that we
* We still don't know if we'll win the election so it is possible that we
* start the failover but that we'll not be able to act.
* start the failover but that we'll not be able to act.
*
*
...
...
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