Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
7a23b945
Commit
7a23b945
authored
Mar 04, 2020
by
antirez
Browse files
Log RDB deletion in persistence-less instances.
parent
baaf869f
Changes
1
Show whitespace changes
Inline
Side-by-side
src/replication.c
View file @
7a23b945
...
@@ -944,6 +944,8 @@ void removeRDBUsedToSyncReplicas(void) {
...
@@ -944,6 +944,8 @@ void removeRDBUsedToSyncReplicas(void) {
}
}
}
}
if
(
delrdb
)
{
if
(
delrdb
)
{
serverLog
(
LL_NOTICE
,
"Removing the RDB file used to feed replicas "
"in a persistence-less instance"
);
RDBGeneratedByReplication
=
0
;
RDBGeneratedByReplication
=
0
;
bg_unlink
(
server
.
rdb_filename
);
bg_unlink
(
server
.
rdb_filename
);
}
}
...
@@ -1707,14 +1709,25 @@ void readSyncBulkPayload(connection *conn) {
...
@@ -1707,14 +1709,25 @@ void readSyncBulkPayload(connection *conn) {
"Failed trying to load the MASTER synchronization "
"Failed trying to load the MASTER synchronization "
"DB from disk"
);
"DB from disk"
);
cancelReplicationHandshake
();
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,
/* Note that there's no point in restarting the AOF on sync failure,
it'll be restarted when sync succeeds or replica promoted. */
it'll be restarted when sync succeeds or replica promoted. */
return
;
return
;
}
}
/* Cleanup. */
/* 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
);
zfree
(
server
.
repl_transfer_tmpfile
);
close
(
server
.
repl_transfer_fd
);
close
(
server
.
repl_transfer_fd
);
server
.
repl_transfer_fd
=
-
1
;
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