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
8105f91a
Commit
8105f91a
authored
Jan 10, 2020
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
9466dae4
b8b8dd5c
Changes
3
Hide whitespace changes
Inline
Side-by-side
redis.conf
View file @
8105f91a
...
@@ -197,7 +197,7 @@ tcp-keepalive 300
...
@@ -197,7 +197,7 @@ tcp-keepalive 300
# When choosing a cipher, use the server's preference instead of the client
# When choosing a cipher, use the server's preference instead of the client
# preference. By default, the server follows the client's preference.
# preference. By default, the server follows the client's preference.
#
#
# tls-prefer-server-cipher yes
# tls-prefer-server-cipher
s
yes
################################# GENERAL #####################################
################################# GENERAL #####################################
...
...
src/db.c
View file @
8105f91a
...
@@ -602,7 +602,7 @@ void keysCommand(client *c) {
...
@@ -602,7 +602,7 @@ void keysCommand(client *c) {
void
*
replylen
=
addReplyDeferredLen
(
c
);
void
*
replylen
=
addReplyDeferredLen
(
c
);
di
=
dictGetSafeIterator
(
c
->
db
->
dict
);
di
=
dictGetSafeIterator
(
c
->
db
->
dict
);
allkeys
=
(
pattern
[
0
]
==
'*'
&&
p
attern
[
1
]
==
'\0'
);
allkeys
=
(
pattern
[
0
]
==
'*'
&&
p
len
==
1
);
while
((
de
=
dictNext
(
di
))
!=
NULL
)
{
while
((
de
=
dictNext
(
di
))
!=
NULL
)
{
sds
key
=
dictGetKey
(
de
);
sds
key
=
dictGetKey
(
de
);
robj
*
keyobj
;
robj
*
keyobj
;
...
...
src/replication.c
View file @
8105f91a
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
#include "server.h"
#include "server.h"
#include "cluster.h"
#include "cluster.h"
#include "bio.h"
#include <sys/time.h>
#include <sys/time.h>
#include <unistd.h>
#include <unistd.h>
...
@@ -1616,14 +1617,20 @@ void readSyncBulkPayload(connection *conn) {
...
@@ -1616,14 +1617,20 @@ void readSyncBulkPayload(connection *conn) {
killRDBChild
();
killRDBChild
();
}
}
/* Rename rdb like renaming rewrite aof asynchronously. */
int
old_rdb_fd
=
open
(
server
.
rdb_filename
,
O_RDONLY
|
O_NONBLOCK
);
if
(
rename
(
server
.
repl_transfer_tmpfile
,
server
.
rdb_filename
)
==
-
1
)
{
if
(
rename
(
server
.
repl_transfer_tmpfile
,
server
.
rdb_filename
)
==
-
1
)
{
serverLog
(
LL_WARNING
,
serverLog
(
LL_WARNING
,
"Failed trying to rename the temp DB into %s in "
"Failed trying to rename the temp DB into %s in "
"MASTER <-> REPLICA synchronization: %s"
,
"MASTER <-> REPLICA synchronization: %s"
,
server
.
rdb_filename
,
strerror
(
errno
));
server
.
rdb_filename
,
strerror
(
errno
));
cancelReplicationHandshake
();
cancelReplicationHandshake
();
if
(
old_rdb_fd
!=
-
1
)
close
(
old_rdb_fd
);
return
;
return
;
}
}
/* Close old rdb asynchronously. */
if
(
old_rdb_fd
!=
-
1
)
bioCreateBackgroundJob
(
BIO_CLOSE_FILE
,(
void
*
)(
long
)
old_rdb_fd
,
NULL
,
NULL
);
if
(
rdbLoad
(
server
.
rdb_filename
,
&
rsi
,
RDBFLAGS_REPLICATION
)
!=
C_OK
)
{
if
(
rdbLoad
(
server
.
rdb_filename
,
&
rsi
,
RDBFLAGS_REPLICATION
)
!=
C_OK
)
{
serverLog
(
LL_WARNING
,
serverLog
(
LL_WARNING
,
"Failed trying to load the MASTER synchronization "
"Failed trying to load the MASTER synchronization "
...
...
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