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
6aa8ac70
Commit
6aa8ac70
authored
Mar 29, 2018
by
zhaozhao.zz
Committed by
antirez
Oct 09, 2018
Browse files
debug: avoid free client unexpectedly when reload & loadaof
parent
48040b02
Changes
1
Show whitespace changes
Inline
Side-by-side
src/debug.c
View file @
6aa8ac70
...
@@ -345,7 +345,10 @@ NULL
...
@@ -345,7 +345,10 @@ NULL
return
;
return
;
}
}
emptyDb
(
-
1
,
EMPTYDB_NO_FLAGS
,
NULL
);
emptyDb
(
-
1
,
EMPTYDB_NO_FLAGS
,
NULL
);
if
(
rdbLoad
(
server
.
rdb_filename
,
NULL
)
!=
C_OK
)
{
aeDeleteFileEvent
(
server
.
el
,
c
->
fd
,
AE_READABLE
);
int
ret
=
rdbLoad
(
server
.
rdb_filename
,
NULL
);
aeCreateFileEvent
(
server
.
el
,
c
->
fd
,
AE_READABLE
,
readQueryFromClient
,
c
);
if
(
ret
!=
C_OK
)
{
addReplyError
(
c
,
"Error trying to load the RDB dump"
);
addReplyError
(
c
,
"Error trying to load the RDB dump"
);
return
;
return
;
}
}
...
@@ -354,7 +357,10 @@ NULL
...
@@ -354,7 +357,10 @@ NULL
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"loadaof"
))
{
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"loadaof"
))
{
if
(
server
.
aof_state
!=
AOF_OFF
)
flushAppendOnlyFile
(
1
);
if
(
server
.
aof_state
!=
AOF_OFF
)
flushAppendOnlyFile
(
1
);
emptyDb
(
-
1
,
EMPTYDB_NO_FLAGS
,
NULL
);
emptyDb
(
-
1
,
EMPTYDB_NO_FLAGS
,
NULL
);
if
(
loadAppendOnlyFile
(
server
.
aof_filename
)
!=
C_OK
)
{
aeDeleteFileEvent
(
server
.
el
,
c
->
fd
,
AE_READABLE
);
int
ret
=
loadAppendOnlyFile
(
server
.
aof_filename
);
aeCreateFileEvent
(
server
.
el
,
c
->
fd
,
AE_READABLE
,
readQueryFromClient
,
c
);
if
(
ret
!=
C_OK
)
{
addReply
(
c
,
shared
.
err
);
addReply
(
c
,
shared
.
err
);
return
;
return
;
}
}
...
...
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