Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
919fbf42
Commit
919fbf42
authored
Feb 06, 2020
by
Oran Agra
Committed by
antirez
Feb 12, 2020
Browse files
reduce repeated calls to use_diskless_load
this function possibly iterates on the module list
parent
22e45d46
Changes
1
Show whitespace changes
Inline
Side-by-side
src/replication.c
View file @
919fbf42
...
...
@@ -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"
,
use
D
iskless
L
oad
()
?
"to parser"
:
"to disk"
);
use
_d
iskless
_l
oad
?
"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
,
use
D
iskless
L
oad
()
?
"to parser"
:
"to disk"
);
use
_d
iskless
_l
oad
?
"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. */
...
...
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