gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'unstable' of github.com:/antirez/redis into unstable

Browse Source
This commit is contained in:
antirez 2020-01-10 13:15:36 +01:00
commit 8105f91a02
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redis.conf
View File

@ -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-ciphers yes
################################# GENERAL ##################################### ################################# GENERAL #####################################

2
src/db.c
View File

@ -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] == '*' && pattern[1] == '\0'); allkeys = (pattern[0] == '*' && plen == 1);
while((de = dictNext(di)) != NULL) { while((de = dictNext(di)) != NULL) {
sds key = dictGetKey(de); sds key = dictGetKey(de);
robj *keyobj; robj *keyobj;

7
src/replication.c
View File

@ -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) {
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 "