From 10a7bfe3a2f5189e3546c4e638a1a8f82543d824 Mon Sep 17 00:00:00 2001 From: Oran Agra Date: Thu, 6 Feb 2020 09:41:45 +0200 Subject: [PATCH] reduce repeated calls to use_diskless_load this function possibly iterates on the module list Former-commit-id: 99762dac23e26a217fcd66531ee4ca9b4d13a7ac --- src/replication.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/replication.cpp b/src/replication.cpp index 29ec9e26e..94d4a7fbe 100644 --- a/src/replication.cpp +++ b/src/replication.cpp @@ -1719,7 +1719,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; rdbSaveInfo rsi = RDB_SAVE_INFO_INIT; int empty_db_flags = g_pserver->repl_slave_lazy_flush ? EMPTYDB_ASYNC : @@ -1782,19 +1782,18 @@ void readSyncBulkPayload(connection *conn) { mi->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; mi->repl_transfer_size = strtol(buf+1,NULL,10); serverLog(LL_NOTICE, "MASTER <-> REPLICA sync: receiving %lld bytes from master %s", (long long) mi->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. */