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
13f48d8d
Commit
13f48d8d
authored
Jan 26, 2016
by
antirez
Browse files
Fix merge conflicts from 3.2.
parent
4d62a82b
Changes
1
Show whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
13f48d8d
...
@@ -531,7 +531,7 @@ void clusterReset(int hard) {
...
@@ -531,7 +531,7 @@ void clusterReset(int hard) {
sdsfree
(
oldname
);
sdsfree
(
oldname
);
getRandomHexChars
(
myself
->
name
,
REDIS_CLUSTER_NAMELEN
);
getRandomHexChars
(
myself
->
name
,
REDIS_CLUSTER_NAMELEN
);
clusterAddNode
(
myself
);
clusterAddNode
(
myself
);
serverLog(LL
_NOTICE,"Node hard reset, now I'm %.40s", myself->name);
redisLog
(
REDIS
_NOTICE
,
"Node hard reset, now I'm %.40s"
,
myself
->
name
);
}
}
/* Make sure to persist the new config and update the state. */
/* Make sure to persist the new config and update the state. */
...
@@ -1341,7 +1341,7 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) {
...
@@ -1341,7 +1341,7 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) {
(
strcasecmp
(
node
->
ip
,
g
->
ip
)
||
node
->
port
!=
ntohs
(
g
->
port
)))
(
strcasecmp
(
node
->
ip
,
g
->
ip
)
||
node
->
port
!=
ntohs
(
g
->
port
)))
{
{
if
(
node
->
link
)
freeClusterLink
(
node
->
link
);
if
(
node
->
link
)
freeClusterLink
(
node
->
link
);
memcpy(node->ip,g->ip,
NET
_IP_STR_LEN);
memcpy
(
node
->
ip
,
g
->
ip
,
REDIS
_IP_STR_LEN
);
node
->
port
=
ntohs
(
g
->
port
);
node
->
port
=
ntohs
(
g
->
port
);
node
->
flags
&=
~
REDIS_NODE_NOADDR
;
node
->
flags
&=
~
REDIS_NODE_NOADDR
;
}
}
...
@@ -1725,7 +1725,7 @@ int clusterProcessPacket(clusterLink *link) {
...
@@ -1725,7 +1725,7 @@ int clusterProcessPacket(clusterLink *link) {
link
->
node
->
name
,
link
->
node
->
name
,
(
int
)(
mstime
()
-
(
link
->
node
->
ctime
)),
(
int
)(
mstime
()
-
(
link
->
node
->
ctime
)),
link
->
node
->
flags
);
link
->
node
->
flags
);
link->node->flags |=
CLUSTER
_NODE_NOADDR;
link
->
node
->
flags
|=
REDIS
_NODE_NOADDR
;
link
->
node
->
ip
[
0
]
=
'\0'
;
link
->
node
->
ip
[
0
]
=
'\0'
;
link
->
node
->
port
=
0
;
link
->
node
->
port
=
0
;
freeClusterLink
(
link
);
freeClusterLink
(
link
);
...
...
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