Skip to content

[fix] Fix consumer doesn't clear incomingMessageQueue during seek #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Demogorgon314 merged 1 commit into from
Nov 2, 2022
Merged

[fix] Fix consumer doesn't clear incomingMessageQueue during seek #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/ConsumerImpl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1397,6 +1397,7 @@ void ConsumerImpl::seekAsyncInternal(long requestId, SharedBuffer seek, const Me
if (result == ResultOk) {
LOG_INFO(getName() << "Seek successfully");
ackGroupingTrackerPtr_->flushAndClean();
incomingMessages_.clear();
Lock lock(mutexForMessageId_);
lastDequedMessageId_ = MessageId::earliest();
lock.unlock();
Expand Down
14 changes: 8 additions & 6 deletions tests/ConsumerTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,14 @@ TEST_P(ConsumerSeekTest, testSeekForMessageId) {
Producer producer;
ASSERT_EQ(ResultOk, client.createProducer(topic, producerConf_, producer));

Consumer consumerExclusive;
ASSERT_EQ(ResultOk, client.subscribe(topic, "sub-0", consumerExclusive));

Consumer consumerInclusive;
ASSERT_EQ(ResultOk,
client.subscribe(topic, "sub-1", ConsumerConfiguration().setStartMessageIdInclusive(true),
consumerInclusive));

const auto numMessages = 100;
MessageId seekMessageId;

Expand All @@ -909,16 +917,10 @@ TEST_P(ConsumerSeekTest, testSeekForMessageId) {

LOG_INFO("The seekMessageId is: " << seekMessageId << ", r : " << r);

Consumer consumerExclusive;
ASSERT_EQ(ResultOk, client.subscribe(topic, "sub-0", consumerExclusive));
consumerExclusive.seek(seekMessageId);
Message msg0;
ASSERT_EQ(ResultOk, consumerExclusive.receive(msg0, 3000));

Consumer consumerInclusive;
ASSERT_EQ(ResultOk,
client.subscribe(topic, "sub-1", ConsumerConfiguration().setStartMessageIdInclusive(true),
consumerInclusive));
consumerInclusive.seek(seekMessageId);
Message msg1;
ASSERT_EQ(ResultOk, consumerInclusive.receive(msg1, 3000));
Expand Down