summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOran Agra <oran@redislabs.com>2020-02-06 09:41:45 +0200
committerOran Agra <oran@redislabs.com>2020-02-06 09:41:45 +0200
commit485d5d4a18441feff626e61e31e480c3054fe877 (patch)
treee7df67831f8cfe216ce4c2b9ec3ce5f31b59a1c3
parent44ac202fbfbca4210d016c9f77df987b27c1ae4c (diff)
downloadredis-485d5d4a18441feff626e61e31e480c3054fe877.tar.gz
reduce repeated calls to use_diskless_load
this function possibly iterates on the module list
-rw-r--r--src/replication.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/replication.c b/src/replication.c
index b7e77184a..7aebd620a 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -1354,7 +1354,7 @@ void disklessLoadRestoreBackups(redisDb *backup, int restore, int empty_db_flags
void readSyncBulkPayload(connection *conn) {
char buf[4096];
ssize_t nread, readlen, nwritten;
- int use_diskless_load;
+ int use_diskless_load = useDisklessLoad();
redisDb *diskless_load_backup = NULL;
int empty_db_flags = server.repl_slave_lazy_flush ? EMPTYDB_ASYNC :
EMPTYDB_NO_FLAGS;
@@ -1411,19 +1411,18 @@ void readSyncBulkPayload(connection *conn) {
server.repl_transfer_size = 0;
serverLog(LL_NOTICE,
"MASTER <-> REPLICA sync: receiving streamed RDB from master with EOF %s",
- useDisklessLoad()? "to parser":"to disk");
+ use_diskless_load? "to parser":"to disk");
} else {
usemark = 0;
server.repl_transfer_size = strtol(buf+1,NULL,10);
serverLog(LL_NOTICE,
"MASTER <-> REPLICA sync: receiving %lld bytes from master %s",
(long long) server.repl_transfer_size,
- useDisklessLoad()? "to parser":"to disk");
+ use_diskless_load? "to parser":"to disk");
}
return;
}
- use_diskless_load = useDisklessLoad();
if (!use_diskless_load) {
/* Read the data from the socket, store it to a file and search
* for the EOF. */