Skip to content

[C++] Use weak ref to ClientConnection for timeout task #12409

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
BewareMyPower merged 2 commits into from
Oct 19, 2021
Merged

[C++] Use weak ref to ClientConnection for timeout task #12409

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d07483
[C++] Use weak ref to ClientConnection for timeout task
merlimat Oct 18, 2021
f8e5383
Fixed formatting
merlimat Oct 18, 2021
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
23 changes: 15 additions & 8 deletions pulsar-client-cpp/lib/ClientConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,18 +532,25 @@ void ClientConnection::handleResolve(const boost::system::error_code& err,
return;
}

auto self = shared_from_this();
connectTimeoutTask_->setCallback([this, self](const PeriodicTask::ErrorCode& ec) {
if (state_ != Ready) {
LOG_ERROR(cnxString_ << "Connection was not established in " << connectTimeoutTask_->getPeriodMs()
<< " ms, close the socket");
auto self = ClientConnectionWeakPtr(shared_from_this());

connectTimeoutTask_->setCallback([self](const PeriodicTask::ErrorCode& ec) {
ClientConnectionPtr ptr = self.lock();
if (!ptr) {
// Connection was already destroyed
return;
}

if (ptr->state_ != Ready) {
LOG_ERROR(ptr->cnxString_ << "Connection was not established in "
<< ptr->connectTimeoutTask_->getPeriodMs() << " ms, close the socket");
PeriodicTask::ErrorCode err;
socket_->close(err);
ptr->socket_->close(err);
if (err) {
LOG_WARN(cnxString_ << "Failed to close socket: " << err.message());
LOG_WARN(ptr->cnxString_ << "Failed to close socket: " << err.message());
}
}
connectTimeoutTask_->stop();
ptr->connectTimeoutTask_->stop();
});

LOG_DEBUG(cnxString_ << "Connecting to " << endpointIterator->endpoint() << "...");
Expand Down