Skip to content

[pulsar-client-cpp] Fix memory leak caused by not being executed ClientConnection destructor #5286

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
merlimat merged 1 commit into from
Sep 29, 2019
Merged

[pulsar-client-cpp] Fix memory leak caused by not being executed ClientConnection destructor #5286

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
13 changes: 10 additions & 3 deletions pulsar-client-cpp/lib/ClientConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ ClientConnection::ClientConnection(const std::string& logicalAddress, const std:
serverProtocolVersion_(ProtocolVersion_MIN),
maxMessageSize_(Commands::DefaultMaxMessageSize),
executor_(executor),
resolver_(executor->createTcpResolver()),
socket_(executor->createSocket()),
resolver_(executor_->createTcpResolver()),
socket_(executor_->createSocket()),
#if BOOST_VERSION >= 107000
strand_(boost::asio::make_strand(executor_->io_service_.get_executor())),
#elif BOOST_VERSION >= 106600
Expand Down Expand Up @@ -222,7 +222,7 @@ ClientConnection::ClientConnection(const std::string& logicalAddress, const std:
}
}

tlsSocket_ = executor->createTlsSocket(socket_, ctx);
tlsSocket_ = executor_->createTlsSocket(socket_, ctx);
}
}

Expand Down Expand Up @@ -1325,6 +1325,9 @@ void ClientConnection::handleConsumerStatsTimeout(const boost::system::error_cod

void ClientConnection::close() {
Lock lock(mutex_);
if (isClosed()) {
return;
}
state_ = Disconnected;
boost::system::error_code err;
socket_->close(err);
Expand Down Expand Up @@ -1385,6 +1388,10 @@ void ClientConnection::close() {
if (tlsSocket_) {
tlsSocket_->lowest_layer().close();
}

if (executor_) {
executor_.reset();
}
}

bool ClientConnection::isClosed() const { return state_ == Disconnected; }
Expand Down
1 change: 1 addition & 0 deletions pulsar-client-cpp/lib/ClientImpl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,7 @@ void ClientImpl::shutdown() {
}
}

pool_.close();
ioExecutorProvider_->close();
listenerExecutorProvider_->close();
partitionListenerExecutorProvider_->close();
Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-cpp/lib/ConnectionPool.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ ConnectionPool::ConnectionPool(const ClientConfiguration& conf, ExecutorServiceP
poolConnections_(poolConnections),
mutex_() {}

ConnectionPool::~ConnectionPool() {
void ConnectionPool::close() {
std::unique_lock<std::mutex> lock(mutex_);
if (poolConnections_) {
for (auto cnxIt = pool_.begin(); cnxIt != pool_.end(); cnxIt++) {
Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-cpp/lib/ConnectionPool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class PULSAR_PUBLIC ConnectionPool {
ConnectionPool(const ClientConfiguration& conf, ExecutorServiceProviderPtr executorProvider,
const AuthenticationPtr& authentication, bool poolConnections = true);

~ConnectionPool();
void close();

/**
* Get a connection from the pool.
Expand Down