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
7c078416
Commit
7c078416
authored
Mar 15, 2020
by
zhaozhao.zz
Committed by
antirez
Mar 25, 2020
Browse files
Threaded IO: bugfix client kill may crash redis
parent
9cc7038e
Changes
1
Show whitespace changes
Inline
Side-by-side
src/networking.c
View file @
7c078416
...
@@ -3040,16 +3040,22 @@ int handleClientsWithPendingReadsUsingThreads(void) {
...
@@ -3040,16 +3040,22 @@ int handleClientsWithPendingReadsUsingThreads(void) {
if
(
tio_debug
)
printf
(
"I/O READ All threads finshed
\n
"
);
if
(
tio_debug
)
printf
(
"I/O READ All threads finshed
\n
"
);
/* Run the list of clients again to process the new buffers. */
/* Run the list of clients again to process the new buffers. */
listRewind
(server.clients_pending_read
,&li);
while
(
listLength
(
server
.
clients_pending_read
))
{
while((
ln = list
Next(&li))) {
ln
=
list
First
(
server
.
clients_pending_read
);
client
*
c
=
listNodeValue
(
ln
);
client
*
c
=
listNodeValue
(
ln
);
c
->
flags
&=
~
CLIENT_PENDING_READ
;
c
->
flags
&=
~
CLIENT_PENDING_READ
;
listDelNode
(
server
.
clients_pending_read
,
ln
);
if
(
c
->
flags
&
CLIENT_PENDING_COMMAND
)
{
if
(
c
->
flags
&
CLIENT_PENDING_COMMAND
)
{
c->flags &= ~ CLIENT_PENDING_COMMAND;
c
->
flags
&=
~
CLIENT_PENDING_COMMAND
;
processCommandAndResetClient(c);
if
(
processCommandAndResetClient
(
c
)
==
C_ERR
)
{
/* If the client is no longer valid, we avoid
* processing the client later. So we just go
* to the next. */
continue
;
}
}
}
processInputBufferAndReplicate
(
c
);
processInputBufferAndReplicate
(
c
);
}
}
listEmpty(server.clients_pending_read);
return
processed
;
return
processed
;
}
}
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