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
f004a3e7
Commit
f004a3e7
authored
Jan 21, 2019
by
WuYunlong
Browse files
Update dict resize policy when rdb child process gets killed.
parent
3f0c2b1f
Changes
2
Show whitespace changes
Inline
Side-by-side
src/db.c
View file @
f004a3e7
...
@@ -451,6 +451,7 @@ void flushallCommand(client *c) {
...
@@ -451,6 +451,7 @@ void flushallCommand(client *c) {
if
(
server
.
rdb_child_pid
!=
-
1
)
{
if
(
server
.
rdb_child_pid
!=
-
1
)
{
kill
(
server
.
rdb_child_pid
,
SIGUSR1
);
kill
(
server
.
rdb_child_pid
,
SIGUSR1
);
rdbRemoveTempFile
(
server
.
rdb_child_pid
);
rdbRemoveTempFile
(
server
.
rdb_child_pid
);
updateDictResizePolicy
();
}
}
if
(
server
.
saveparamslen
>
0
)
{
if
(
server
.
saveparamslen
>
0
)
{
/* Normally rdbSave() will reset dirty, but we don't want this here
/* Normally rdbSave() will reset dirty, but we don't want this here
...
...
src/replication.c
View file @
f004a3e7
...
@@ -1255,6 +1255,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
...
@@ -1255,6 +1255,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
(
long
)
server
.
rdb_child_pid
);
(
long
)
server
.
rdb_child_pid
);
kill
(
server
.
rdb_child_pid
,
SIGUSR1
);
kill
(
server
.
rdb_child_pid
,
SIGUSR1
);
rdbRemoveTempFile
(
server
.
rdb_child_pid
);
rdbRemoveTempFile
(
server
.
rdb_child_pid
);
updateDictResizePolicy
();
}
}
if
(
rename
(
server
.
repl_transfer_tmpfile
,
server
.
rdb_filename
)
==
-
1
)
{
if
(
rename
(
server
.
repl_transfer_tmpfile
,
server
.
rdb_filename
)
==
-
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