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
3ce1c28d
Commit
3ce1c28d
authored
Jan 09, 2018
by
antirez
Browse files
Rewrite MIGRATE AUTH option.
See PR #2507. This is a reimplementation of the fix that contained different problems.
parent
e509fbb8
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
3ce1c28d
...
@@ -4896,14 +4896,16 @@ void migrateCloseTimedoutSockets(void) {
...
@@ -4896,14 +4896,16 @@ void migrateCloseTimedoutSockets(void) {
dictReleaseIterator
(
di
);
dictReleaseIterator
(
di
);
}
}
/* MIGRATE host port key dbid timeout [COPY | REPLACE]
/* MIGRATE host port key dbid timeout [COPY | REPLACE
| AUTH password
]
*
*
* On in the multiple keys form:
* On in the multiple keys form:
*
*
* MIGRATE host port "" dbid timeout [COPY | REPLACE] KEYS key1 key2 ... keyN */
* MIGRATE host port "" dbid timeout [COPY | REPLACE | AUTH password] KEYS key1
* key2 ... keyN */
void
migrateCommand
(
client
*
c
)
{
void
migrateCommand
(
client
*
c
)
{
migrateCachedSocket
*
cs
;
migrateCachedSocket
*
cs
;
int
copy
,
replace
,
j
;
int
copy
=
0
,
replace
=
0
,
j
;
char
*
password
=
NULL
;
long
timeout
;
long
timeout
;
long
dbid
;
long
dbid
;
robj
**
ov
=
NULL
;
/* Objects to migrate. */
robj
**
ov
=
NULL
;
/* Objects to migrate. */
...
@@ -4918,16 +4920,20 @@ void migrateCommand(client *c) {
...
@@ -4918,16 +4920,20 @@ void migrateCommand(client *c) {
int
first_key
=
3
;
/* Argument index of the first key. */
int
first_key
=
3
;
/* Argument index of the first key. */
int
num_keys
=
1
;
/* By default only migrate the 'key' argument. */
int
num_keys
=
1
;
/* By default only migrate the 'key' argument. */
/* Initialization */
copy
=
0
;
replace
=
0
;
/* Parse additional options */
/* Parse additional options */
for
(
j
=
6
;
j
<
c
->
argc
;
j
++
)
{
for
(
j
=
6
;
j
<
c
->
argc
;
j
++
)
{
int
moreargs
=
j
<
c
->
argc
-
1
;
if
(
!
strcasecmp
(
c
->
argv
[
j
]
->
ptr
,
"copy"
))
{
if
(
!
strcasecmp
(
c
->
argv
[
j
]
->
ptr
,
"copy"
))
{
copy
=
1
;
copy
=
1
;
}
else
if
(
!
strcasecmp
(
c
->
argv
[
j
]
->
ptr
,
"replace"
))
{
}
else
if
(
!
strcasecmp
(
c
->
argv
[
j
]
->
ptr
,
"replace"
))
{
replace
=
1
;
replace
=
1
;
}
else
if
(
!
strcasecmp
(
c
->
argv
[
j
]
->
ptr
,
"auth"
))
{
if
(
!
moreargs
)
{
addReply
(
c
,
shared
.
syntaxerr
);
return
;
}
j
++
;
password
=
c
->
argv
[
j
]
->
ptr
;
}
else
if
(
!
strcasecmp
(
c
->
argv
[
j
]
->
ptr
,
"keys"
))
{
}
else
if
(
!
strcasecmp
(
c
->
argv
[
j
]
->
ptr
,
"keys"
))
{
if
(
sdslen
(
c
->
argv
[
3
]
->
ptr
)
!=
0
)
{
if
(
sdslen
(
c
->
argv
[
3
]
->
ptr
)
!=
0
)
{
addReplyError
(
c
,
addReplyError
(
c
,
...
@@ -4986,6 +4992,14 @@ try_again:
...
@@ -4986,6 +4992,14 @@ try_again:
rioInitWithBuffer
(
&
cmd
,
sdsempty
());
rioInitWithBuffer
(
&
cmd
,
sdsempty
());
/* Authentication */
if
(
password
)
{
serverAssertWithInfo
(
c
,
NULL
,
rioWriteBulkCount
(
&
cmd
,
'*'
,
2
));
serverAssertWithInfo
(
c
,
NULL
,
rioWriteBulkString
(
&
cmd
,
"AUTH"
,
4
));
serverAssertWithInfo
(
c
,
NULL
,
rioWriteBulkString
(
&
cmd
,
password
,
sdslen
(
password
)));
}
/* Send the SELECT command if the current DB is not already selected. */
/* Send the SELECT command if the current DB is not already selected. */
int
select
=
cs
->
last_dbid
!=
dbid
;
/* Should we emit SELECT? */
int
select
=
cs
->
last_dbid
!=
dbid
;
/* Should we emit SELECT? */
if
(
select
)
{
if
(
select
)
{
...
@@ -5003,7 +5017,9 @@ try_again:
...
@@ -5003,7 +5017,9 @@ try_again:
ttl
=
expireat
-
mstime
();
ttl
=
expireat
-
mstime
();
if
(
ttl
<
1
)
ttl
=
1
;
if
(
ttl
<
1
)
ttl
=
1
;
}
}
serverAssertWithInfo
(
c
,
NULL
,
rioWriteBulkCount
(
&
cmd
,
'*'
,
replace
?
5
:
4
));
serverAssertWithInfo
(
c
,
NULL
,
rioWriteBulkCount
(
&
cmd
,
'*'
,
replace
?
5
:
4
));
if
(
server
.
cluster_enabled
)
if
(
server
.
cluster_enabled
)
serverAssertWithInfo
(
c
,
NULL
,
serverAssertWithInfo
(
c
,
NULL
,
rioWriteBulkString
(
&
cmd
,
"RESTORE-ASKING"
,
14
));
rioWriteBulkString
(
&
cmd
,
"RESTORE-ASKING"
,
14
));
...
@@ -5046,9 +5062,14 @@ try_again:
...
@@ -5046,9 +5062,14 @@ try_again:
}
}
}
}
char
buf0
[
1024
];
/* Auth reply. */
char
buf1
[
1024
];
/* Select reply. */
char
buf1
[
1024
];
/* Select reply. */
char
buf2
[
1024
];
/* Restore reply. */
char
buf2
[
1024
];
/* Restore reply. */
/* Read the AUTH reply if needed. */
if
(
password
&&
syncReadLine
(
cs
->
fd
,
buf0
,
sizeof
(
buf0
),
timeout
)
<=
0
)
goto
socket_err
;
/* Read the SELECT reply if needed. */
/* Read the SELECT reply if needed. */
if
(
select
&&
syncReadLine
(
cs
->
fd
,
buf1
,
sizeof
(
buf1
),
timeout
)
<=
0
)
if
(
select
&&
syncReadLine
(
cs
->
fd
,
buf1
,
sizeof
(
buf1
),
timeout
)
<=
0
)
goto
socket_err
;
goto
socket_err
;
...
@@ -5065,13 +5086,18 @@ try_again:
...
@@ -5065,13 +5086,18 @@ try_again:
socket_error
=
1
;
socket_error
=
1
;
break
;
break
;
}
}
if
((
select
&&
buf1
[
0
]
==
'-'
)
||
buf2
[
0
]
==
'-'
)
{
if
(
buf0
[
0
]
==
'-'
||
(
select
&&
buf1
[
0
]
==
'-'
)
||
buf2
[
0
]
==
'-'
)
{
/* On error assume that last_dbid is no longer valid. */
/* On error assume that last_dbid is no longer valid. */
if
(
!
error_from_target
)
{
if
(
!
error_from_target
)
{
cs
->
last_dbid
=
-
1
;
cs
->
last_dbid
=
-
1
;
addReplyErrorFormat
(
c
,
"Target instance replied with error: %s"
,
char
*
errbuf
;
(
select
&&
buf1
[
0
]
==
'-'
)
?
buf1
+
1
:
buf2
+
1
);
if
(
buf0
[
0
]
==
'-'
)
errbuf
=
buf0
;
else
if
(
select
&&
buf1
[
0
]
==
'-'
)
errbuf
=
buf1
;
else
errbuf
=
buf2
;
error_from_target
=
1
;
error_from_target
=
1
;
addReplyErrorFormat
(
c
,
"Target instance replied with error: %s"
,
errbuf
+
1
);
}
}
}
else
{
}
else
{
if
(
!
copy
)
{
if
(
!
copy
)
{
...
@@ -5136,7 +5162,7 @@ try_again:
...
@@ -5136,7 +5162,7 @@ try_again:
addReply
(
c
,
shared
.
ok
);
addReply
(
c
,
shared
.
ok
);
}
else
{
}
else
{
/* On error we already sent it in the for loop above, and set
/* On error we already sent it in the for loop above, and set
* the curretly selected socket to -1 to force SELECT the next time. */
* the curre
n
tly selected socket to -1 to force SELECT the next time. */
}
}
sdsfree
(
cmd
.
io
.
buffer
.
ptr
);
sdsfree
(
cmd
.
io
.
buffer
.
ptr
);
...
...
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