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
2c4ab8a5
Commit
2c4ab8a5
authored
Dec 10, 2013
by
antirez
Browse files
Log empty DB + Loading data into two separated messages.
parent
7c531eb5
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/replication.c
View file @
2c4ab8a5
...
...
@@ -794,7 +794,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
replicationAbortSyncTransfer
();
return
;
}
redisLog
(
REDIS_NOTICE
,
"MASTER <-> SLAVE sync:
Loading DB in memory
"
);
redisLog
(
REDIS_NOTICE
,
"MASTER <-> SLAVE sync:
Flushing old data
"
);
signalFlushedDb
(
-
1
);
emptyDb
();
/* Before loading the DB into memory we need to delete the readable
...
...
@@ -802,6 +802,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
* rdbLoad() will call the event loop to process events from time to
* time for non blocking loading. */
aeDeleteFileEvent
(
server
.
el
,
server
.
repl_transfer_s
,
AE_READABLE
);
redisLog
(
REDIS_NOTICE
,
"MASTER <-> SLAVE sync: Loading DB in memory"
);
if
(
rdbLoad
(
server
.
rdb_filename
)
!=
REDIS_OK
)
{
redisLog
(
REDIS_WARNING
,
"Failed trying to load the MASTER synchronization DB from disk"
);
replicationAbortSyncTransfer
();
...
...
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