Skip to content

Do not change subscribed state from assign / unassign methods (#29) #30

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
merged 1 commit into from
Sep 25, 2016
Merged

Do not change subscribed state from assign / unassign methods (#29) #30

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
8 changes: 2 additions & 6 deletions src/consumer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,6 @@ Baton Consumer::Assign(std::vector<RdKafka::TopicPartition*> partitions) {
m_partition_cnt = partitions.size();
m_partitions.swap(partitions);

m_is_subscribed = true;

return Baton(RdKafka::ERR_NO_ERROR);
}

Expand All @@ -172,8 +170,6 @@ Baton Consumer::Unassign() {
return Baton(errcode);
}

m_is_subscribed = false;

m_partitions.empty();
m_partition_cnt = 0;

Expand Down Expand Up @@ -250,9 +246,9 @@ Baton Consumer::Subscribe(std::vector<std::string> topics) {
NodeKafka::Message* Consumer::Consume() {
NodeKafka::Message* m;

if (IsConnected() && IsSubscribed()) {
if (IsConnected()) {
scoped_mutex_lock lock(m_connection_lock);
if (!IsConnected() && IsSubscribed()) {
if (!IsConnected()) {
m = new NodeKafka::Message(RdKafka::ERR__STATE);
} else {
RdKafka::KafkaConsumer* consumer =
Expand Down
2 changes: 1 addition & 1 deletion src/workers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ ConsumerConsumeLoop::~ConsumerConsumeLoop() {}

void ConsumerConsumeLoop::Execute(const ExecutionMessageBus& bus) {
// Do one check here before we move forward
while (consumer->IsConnected() && consumer->IsSubscribed()) {
while (consumer->IsConnected()) {
NodeKafka::Message* message = consumer->Consume();
if (message->errcode() == RdKafka::ERR__PARTITION_EOF) {
delete message;
Expand Down