Skip to content

Fix tracker promise from throwing when set multiple times #235

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 2 commits into from
Feb 4, 2020
Merged

Fix tracker promise from throwing when set multiple times #235

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bda2f41
Fix tracker promise from throwing when set multiple times
Feb 3, 2020
fbbd5bc
Changed int to size_t
Feb 4, 2020
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
18 changes: 16 additions & 2 deletions include/cppkafka/utils/buffered_producer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,16 @@ void BufferedProducer<BufferType, Allocator>::clear() {

template <typename BufferType, typename Allocator>
size_t BufferedProducer<BufferType, Allocator>::get_buffer_size() const {
return messages_.size() + retry_messages_.size();
size_t size = 0;
{
std::lock_guard<std::mutex> lock(mutex_);
size += messages_.size();
}
{
std::lock_guard<std::mutex> lock(retry_mutex_);
size += retry_messages_.size();
}
return size;
}

template <typename BufferType, typename Allocator>
Expand Down Expand Up @@ -1025,7 +1034,12 @@ void BufferedProducer<BufferType, Allocator>::on_delivery_report(const Message&
}
// Signal producers
if (tracker) {
tracker->should_retry_.set_value(should_retry);
try {
tracker->should_retry_.set_value(should_retry);
}
catch (const std::future_error& ex) {
//This is an async retry and future is not being read
}
}
// Decrement the expected acks and check to prevent underflow
if (pending_acks_ > 0) {
Expand Down