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
61f12973
Commit
61f12973
authored
Jul 09, 2018
by
dejun.xdj
Committed by
Salvatore Sanfilippo
Jul 09, 2018
Browse files
Bugfix: PEL is incorrect when consumer is blocked using xreadgroup with NOACK option.
Save NOACK option into client.blockingState structure.
parent
b67f0276
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/blocked.c
View file @
61f12973
...
...
@@ -382,6 +382,7 @@ void handleClientsBlockedOnKeys(void) {
* consumer here. */
streamCG
*
group
=
NULL
;
streamConsumer
*
consumer
=
NULL
;
int
noack
=
0
;
if
(
receiver
->
bpop
.
xread_group
)
{
group
=
streamLookupCG
(
s
,
receiver
->
bpop
.
xread_group
->
ptr
);
...
...
@@ -396,6 +397,7 @@ void handleClientsBlockedOnKeys(void) {
consumer
=
streamLookupConsumer
(
group
,
receiver
->
bpop
.
xread_consumer
->
ptr
,
1
);
noack
=
receiver
->
bpop
.
xread_group_noack
;
}
/* Emit the two elements sub-array consisting of
...
...
@@ -412,7 +414,7 @@ void handleClientsBlockedOnKeys(void) {
};
streamReplyWithRange
(
receiver
,
s
,
&
start
,
NULL
,
receiver
->
bpop
.
xread_count
,
0
,
group
,
consumer
,
0
,
&
pi
);
0
,
group
,
consumer
,
noack
,
&
pi
);
/* Note that after we unblock the client, 'gt'
* and other receiver->bpop stuff are no longer
...
...
src/networking.c
View file @
61f12973
...
...
@@ -140,6 +140,7 @@ client *createClient(int fd) {
c
->
bpop
.
target
=
NULL
;
c
->
bpop
.
xread_group
=
NULL
;
c
->
bpop
.
xread_consumer
=
NULL
;
c
->
bpop
.
xread_group_noack
=
0
;
c
->
bpop
.
numreplicas
=
0
;
c
->
bpop
.
reploffset
=
0
;
c
->
woff
=
0
;
...
...
src/server.h
View file @
61f12973
...
...
@@ -665,6 +665,7 @@ typedef struct blockingState {
robj
*
xread_group
;
/* XREADGROUP group name. */
robj
*
xread_consumer
;
/* XREADGROUP consumer name. */
mstime_t
xread_retry_time
,
xread_retry_ttl
;
int
xread_group_noack
;
/* BLOCKED_WAIT */
int
numreplicas
;
/* Number of replicas we are waiting for ACK. */
...
...
src/t_stream.c
View file @
61f12973
...
...
@@ -1426,6 +1426,7 @@ void xreadCommand(client *c) {
incrRefCount
(
consumername
);
c
->
bpop
.
xread_group
=
groupname
;
c
->
bpop
.
xread_consumer
=
consumername
;
c
->
bpop
.
xread_group_noack
=
noack
;
}
else
{
c
->
bpop
.
xread_group
=
NULL
;
c
->
bpop
.
xread_consumer
=
NULL
;
...
...
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