Skip to content

TS-4187: Keep the currently_open connections in sync with open sockets #583

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

Closed
shinrich wants to merge 1 commit into from
Closed

TS-4187: Keep the currently_open connections in sync with open sockets #583

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
1 change: 0 additions & 1 deletion iocore/net/SSLNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,6 @@ SSLNetVConnection::do_io_close(int lerrno)
void
SSLNetVConnection::free(EThread *t)
{
NET_SUM_GLOBAL_DYN_STAT(net_connections_currently_open_stat, -1);
got_remote_addr = 0;
got_local_addr = 0;
read.vio.mutex.clear();
Expand Down
8 changes: 3 additions & 5 deletions iocore/net/UnixNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ net_activity(UnixNetVConnection *vc, EThread *thread)
void
close_UnixNetVConnection(UnixNetVConnection *vc, EThread *t)
{
if (vc->con.fd != NO_FD) {
NET_SUM_GLOBAL_DYN_STAT(net_connections_currently_open_stat, -1);
}
NetHandler *nh = vc->nh;
vc->cancel_OOB();
vc->ep.stop();
Expand Down Expand Up @@ -1318,7 +1321,6 @@ void
UnixNetVConnection::free(EThread *t)
{
ink_release_assert(t == this_ethread());
NET_SUM_GLOBAL_DYN_STAT(net_connections_currently_open_stat, -1);
// clear variables for reuse
this->mutex.clear();
action_.mutex.clear();
Expand Down Expand Up @@ -1393,10 +1395,6 @@ UnixNetVConnection::migrateToCurrentThread(Continuation *cont, EThread *t)
this->ep.stop();
this->do_io_close();

// The do_io_close will decrement the current stat count but we are creating a new vc.
// Increment the currently open stat here so the net current count is unchanged
NET_SUM_GLOBAL_DYN_STAT(net_connections_currently_open_stat, 1);

// Create new VC:
if (save_ssl) {
SSLNetVConnection *sslvc = static_cast<SSLNetVConnection *>(sslNetProcessor.allocate_vc(t));
Expand Down