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
ff024e30
Commit
ff024e30
authored
Mar 04, 2020
by
antirez
Browse files
Log RDB deletion in persistence-less instances.
parent
f0acdee4
Changes
1
Show whitespace changes
Inline
Side-by-side
src/replication.c
View file @
ff024e30
...
...
@@ -944,6 +944,8 @@ void removeRDBUsedToSyncReplicas(void) {
}
}
if
(
delrdb
)
{
serverLog
(
LL_NOTICE
,
"Removing the RDB file used to feed replicas "
"in a persistence-less instance"
);
RDBGeneratedByReplication
=
0
;
bg_unlink
(
server
.
rdb_filename
);
}
...
...
@@ -1707,14 +1709,25 @@ void readSyncBulkPayload(connection *conn) {
"Failed trying to load the MASTER synchronization "
"DB from disk"
);
cancelReplicationHandshake
();
if
(
allPersistenceDisabled
())
bg_unlink
(
server
.
rdb_filename
);
if
(
allPersistenceDisabled
())
{
serverLog
(
LL_NOTICE
,
"Removing the RDB file obtained from "
"the master. This replica has persistence "
"disabled"
);
bg_unlink
(
server
.
rdb_filename
);
}
/* Note that there's no point in restarting the AOF on sync failure,
it'll be restarted when sync succeeds or replica promoted. */
return
;
}
/* Cleanup. */
if
(
allPersistenceDisabled
())
bg_unlink
(
server
.
rdb_filename
);
if
(
allPersistenceDisabled
())
{
serverLog
(
LL_NOTICE
,
"Removing the RDB file obtained from "
"the master. This replica has persistence "
"disabled"
);
bg_unlink
(
server
.
rdb_filename
);
}
zfree
(
server
.
repl_transfer_tmpfile
);
close
(
server
.
repl_transfer_fd
);
server
.
repl_transfer_fd
=
-
1
;
...
...
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