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
2303ba14
Commit
2303ba14
authored
Aug 31, 2019
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
ca5ccc58
16435e02
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/module.c
View file @
2303ba14
...
@@ -5389,6 +5389,7 @@ void moduleRegisterCoreAPI(void) {
...
@@ -5389,6 +5389,7 @@ void moduleRegisterCoreAPI(void) {
REGISTER_API
(
ReplySetArrayLength
);
REGISTER_API
(
ReplySetArrayLength
);
REGISTER_API
(
ReplyWithString
);
REGISTER_API
(
ReplyWithString
);
REGISTER_API
(
ReplyWithStringBuffer
);
REGISTER_API
(
ReplyWithStringBuffer
);
REGISTER_API
(
ReplyWithCString
);
REGISTER_API
(
ReplyWithNull
);
REGISTER_API
(
ReplyWithNull
);
REGISTER_API
(
ReplyWithCallReply
);
REGISTER_API
(
ReplyWithCallReply
);
REGISTER_API
(
ReplyWithDouble
);
REGISTER_API
(
ReplyWithDouble
);
...
...
src/networking.c
View file @
2303ba14
...
@@ -2468,7 +2468,6 @@ void flushSlavesOutputBuffers(void) {
...
@@ -2468,7 +2468,6 @@ void flushSlavesOutputBuffers(void) {
listRewind
(
server
.
slaves
,
&
li
);
listRewind
(
server
.
slaves
,
&
li
);
while
((
ln
=
listNext
(
&
li
)))
{
while
((
ln
=
listNext
(
&
li
)))
{
client
*
slave
=
listNodeValue
(
ln
);
client
*
slave
=
listNodeValue
(
ln
);
int
events
;
/* Note that the following will not flush output buffers of slaves
/* Note that the following will not flush output buffers of slaves
* in STATE_ONLINE but having put_online_on_ack set to true: in this
* in STATE_ONLINE but having put_online_on_ack set to true: in this
...
@@ -2477,9 +2476,8 @@ void flushSlavesOutputBuffers(void) {
...
@@ -2477,9 +2476,8 @@ void flushSlavesOutputBuffers(void) {
* This is what we want since slaves in this state should not receive
* This is what we want since slaves in this state should not receive
* writes before the first ACK (to know the reason, grep for this
* writes before the first ACK (to know the reason, grep for this
* flag in this file). */
* flag in this file). */
events
=
aeGetFileEvents
(
server
.
el
,
slave
->
fd
);
if
(
slave
->
replstate
==
SLAVE_STATE_ONLINE
&&
if
(
events
&
AE_WRITABLE
&&
!
slave
->
repl_put_online_on_ack
&&
slave
->
replstate
==
SLAVE_STATE_ONLINE
&&
clientHasPendingReplies
(
slave
))
clientHasPendingReplies
(
slave
))
{
{
writeToClient
(
slave
->
fd
,
slave
,
0
);
writeToClient
(
slave
->
fd
,
slave
,
0
);
...
...
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