Skip to content

Avoid leaking channel after shutdown and avoid sending channel.close when the channel isn't open #110

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
michalovits merged 3 commits into from
Nov 5, 2026
Merged

Avoid leaking channel after shutdown and avoid sending channel.close when the channel isn't open #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9eba6d
Avoid sending `channel.close` when the channel isn't open
michalovits Nov 5, 2026
41fe37d
Merge branch 'main' into close-when-open
michalovits Nov 5, 2026
0795a82
Merge branch 'main' into close-when-open
michalovits Nov 5, 2026
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
12 changes: 11 additions & 1 deletion src/rmq/rmqamqp/rmqamqp_channel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ Channel::CleanupIndicator Channel::reset(bool startRetry)
d_metricPublisher->publishCounter(
"channel_disconnected", 1, getVHostAndChannelTags());

return KEEP;
return d_permanentlyClosing ? CLEANUP : KEEP;
}

void Channel::retry(const bsl::weak_ptr<Channel>& weakSelf)
Expand Down Expand Up @@ -498,6 +498,11 @@ void Channel::ready()

void Channel::open()
{
if (d_permanentlyClosing) {
BALL_LOG_DEBUG << "Not opening a channel which is permanently closing";
return;
}

using bdlf::PlaceHolders::_1;
d_hungProgressTimer->start(
bdlf::BindUtil::bind(&Channel::channelHung, weak_from_this(), _1));
Expand Down Expand Up @@ -526,6 +531,11 @@ void Channel::writeMessage(
void Channel::gracefulClose()
{
d_permanentlyClosing = true;

if (d_state == CLOSED || d_state == CHANNEL_CLOSE_SENT) {
return;
}

close(rmqamqpt::Constants::REPLY_SUCCESS, "Closing Channel");
}

Expand Down
38 changes: 30 additions & 8 deletions src/tests/rmqamqp/rmqamqp_channel.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,19 +196,41 @@ TEST_F(ChannelTests, OpenChannel)
bsl::shared_ptr<ChannelTestImpl> channel = makeOpeningChannel(d_topology);
}

TEST_F(ChannelTests, GracefulCloseChannel)
TEST_F(ChannelTests, GracefulCloseOnClosedChannelNeverReopens)
{
bsl::shared_ptr<ChannelTestImpl> mockChannel = makeChannel(d_topology);
rmqamqpt::ChannelClose closeMethod(rmqamqpt::Constants::REPLY_SUCCESS,
"Closing Channel");

EXPECT_CALL(d_callback,
onAsyncWrite(::testing::Pointee(
MessageEq(rmqamqp::Message(rmqamqpt::Method(
rmqamqpt::ChannelMethod(closeMethod))))),
_));
EXPECT_CALL(d_callback, onAsyncWrite(_, _)).Times(0);

mockChannel->gracefulClose();
mockChannel->open();
}

TEST_F(ChannelTests, GracefulCloseWhileClosingCleansUpOnCloseOk)
{
bsl::shared_ptr<ChannelTestImpl> mockChannel = makeChannel(d_topology);
mockChannel->setState(rmqamqp::Channel::CHANNEL_CLOSE_SENT);

EXPECT_CALL(d_callback, onAsyncWrite(_, _)).Times(0);

mockChannel->gracefulClose();

rmqamqpt::ChannelCloseOk closeOkMethod;
EXPECT_THAT(mockChannel->processReceived(rmqamqp::Message(
rmqamqpt::Method(rmqamqpt::ChannelMethod(closeOkMethod)))),
Eq(rmqamqp::Channel::CLEANUP));
}

TEST_F(ChannelTests, ResetDuringGracefulCloseReturnsCleanup)
{
bsl::shared_ptr<ChannelTestImpl> mockChannel =
makeOpeningChannel(d_topology);
mockChannel->setState(rmqamqp::Channel::READY);

EXPECT_CALL(d_callback, onAsyncWrite(_, _));
mockChannel->gracefulClose();

EXPECT_THAT(mockChannel->reset(), Eq(rmqamqp::Channel::CLEANUP));
}

TEST_F(ChannelTests, closingProcessCloseOkReturnsCleanup)
Expand Down
Loading