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
9f939610
Unverified
Commit
9f939610
authored
Jan 21, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Jan 21, 2019
Browse files
Merge pull request #5797 from trevor211/fixUpdateDictResizePolicy
Fix update dict resize policy
parents
c8391388
f004a3e7
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/aof.c
View file @
9f939610
...
@@ -221,6 +221,8 @@ static void killAppendOnlyChild(void) {
...
@@ -221,6 +221,8 @@ static void killAppendOnlyChild(void) {
server
.
aof_rewrite_time_start
=
-
1
;
server
.
aof_rewrite_time_start
=
-
1
;
/* Close pipes used for IPC between the two processes. */
/* Close pipes used for IPC between the two processes. */
aofClosePipes
();
aofClosePipes
();
updateDictResizePolicy
();
}
}
/* Called when the user switches from "appendonly yes" to "appendonly no"
/* Called when the user switches from "appendonly yes" to "appendonly no"
...
...
src/db.c
View file @
9f939610
...
@@ -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 @
9f939610
...
@@ -1256,6 +1256,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
...
@@ -1256,6 +1256,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