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
05fa4f40
Commit
05fa4f40
authored
Apr 04, 2013
by
antirez
Browse files
Cluster: node timeout is now configurable.
parent
00bab23c
Changes
5
Hide whitespace changes
Inline
Side-by-side
redis.conf
View file @
05fa4f40
...
@@ -493,6 +493,12 @@ lua-time-limit 5000
...
@@ -493,6 +493,12 @@ lua-time-limit 5000
#
#
# cluster-config-file nodes-6379.conf
# cluster-config-file nodes-6379.conf
# Cluster node timeout is the amount of seconds a node must be unreachable
# for it to be considered in failure state.
# Most other internal time limits are multiplicators of the node timeout.
#
# cluster-node-timeout 15
# In order to setup your cluster make sure to read the documentation
# In order to setup your cluster make sure to read the documentation
# available at http://redis.io web site.
# available at http://redis.io web site.
...
...
src/cluster.c
View file @
05fa4f40
...
@@ -231,7 +231,7 @@ void clusterInit(void) {
...
@@ -231,7 +231,7 @@ void clusterInit(void) {
server
.
cluster
->
state
=
REDIS_CLUSTER_FAIL
;
server
.
cluster
->
state
=
REDIS_CLUSTER_FAIL
;
server
.
cluster
->
size
=
1
;
server
.
cluster
->
size
=
1
;
server
.
cluster
->
nodes
=
dictCreate
(
&
clusterNodesDictType
,
NULL
);
server
.
cluster
->
nodes
=
dictCreate
(
&
clusterNodesDictType
,
NULL
);
server
.
cluster
->
node_timeout
=
REDIS_CLUSTER_DEFAULT_NODE_TIMEOUT
;
server
.
cluster
->
node_timeout
=
server
.
cluster_node_timeout
;
server
.
cluster
->
failover_auth_time
=
0
;
server
.
cluster
->
failover_auth_time
=
0
;
server
.
cluster
->
failover_auth_count
=
0
;
server
.
cluster
->
failover_auth_count
=
0
;
memset
(
server
.
cluster
->
migrating_slots_to
,
0
,
memset
(
server
.
cluster
->
migrating_slots_to
,
0
,
...
...
src/config.c
View file @
05fa4f40
...
@@ -387,6 +387,11 @@ void loadServerConfigFromString(char *config) {
...
@@ -387,6 +387,11 @@ void loadServerConfigFromString(char *config) {
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"cluster-config-file"
)
&&
argc
==
2
)
{
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"cluster-config-file"
)
&&
argc
==
2
)
{
zfree
(
server
.
cluster_configfile
);
zfree
(
server
.
cluster_configfile
);
server
.
cluster_configfile
=
zstrdup
(
argv
[
1
]);
server
.
cluster_configfile
=
zstrdup
(
argv
[
1
]);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"cluster-node-timeout"
)
&&
argc
==
2
)
{
server
.
cluster_node_timeout
=
atoi
(
argv
[
1
]);
if
(
server
.
cluster_node_timeout
<=
0
)
{
err
=
"cluster node timeout must be 1 or greater"
;
goto
loaderr
;
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"lua-time-limit"
)
&&
argc
==
2
)
{
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"lua-time-limit"
)
&&
argc
==
2
)
{
server
.
lua_time_limit
=
strtoll
(
argv
[
1
],
NULL
,
10
);
server
.
lua_time_limit
=
strtoll
(
argv
[
1
],
NULL
,
10
);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"slowlog-log-slower-than"
)
&&
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"slowlog-log-slower-than"
)
&&
...
...
src/redis.c
View file @
05fa4f40
...
@@ -1261,6 +1261,7 @@ void initServerConfig() {
...
@@ -1261,6 +1261,7 @@ void initServerConfig() {
server
.
repl_ping_slave_period
=
REDIS_REPL_PING_SLAVE_PERIOD
;
server
.
repl_ping_slave_period
=
REDIS_REPL_PING_SLAVE_PERIOD
;
server
.
repl_timeout
=
REDIS_REPL_TIMEOUT
;
server
.
repl_timeout
=
REDIS_REPL_TIMEOUT
;
server
.
cluster_enabled
=
0
;
server
.
cluster_enabled
=
0
;
server
.
cluster_node_timeout
=
REDIS_CLUSTER_DEFAULT_NODE_TIMEOUT
;
server
.
cluster_configfile
=
zstrdup
(
"nodes.conf"
);
server
.
cluster_configfile
=
zstrdup
(
"nodes.conf"
);
server
.
lua_caller
=
NULL
;
server
.
lua_caller
=
NULL
;
server
.
lua_time_limit
=
REDIS_LUA_TIME_LIMIT
;
server
.
lua_time_limit
=
REDIS_LUA_TIME_LIMIT
;
...
...
src/redis.h
View file @
05fa4f40
...
@@ -853,6 +853,7 @@ struct redisServer {
...
@@ -853,6 +853,7 @@ struct redisServer {
xor of REDIS_NOTIFY... flags. */
xor of REDIS_NOTIFY... flags. */
/* Cluster */
/* Cluster */
int
cluster_enabled
;
/* Is cluster enabled? */
int
cluster_enabled
;
/* Is cluster enabled? */
int
cluster_node_timeout
;
/* Cluster node timeout. */
char
*
cluster_configfile
;
/* Cluster auto-generated config file name. */
char
*
cluster_configfile
;
/* Cluster auto-generated config file name. */
clusterState
*
cluster
;
/* State of the cluster */
clusterState
*
cluster
;
/* State of the cluster */
/* Scripting */
/* Scripting */
...
...
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