Skip to content

ConnectionTracker: Remove queue implementation #10825

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
bneradt merged 1 commit into from
Nov 18, 2023
Merged

ConnectionTracker: Remove queue implementation #10825

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
21 changes: 0 additions & 21 deletions include/iocore/net/ConnectionTracker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,6 @@ class ConnectionTracker
int reserve();
/// Release a connection reservation.
void release();
/// Reserve a queue / retry slot.
int enqueue();
/// Release a block
void dequeue();
/// Note blocking a transaction.
void blocked();
/// Clear all reservations.
Expand Down Expand Up @@ -355,27 +351,10 @@ ConnectionTracker::TxnState::drop()
return std::move(_g);
}

inline int
ConnectionTracker::TxnState::enqueue()
{
_queued_p = true;
return ++_g->_in_queue;
}

inline void
ConnectionTracker::TxnState::dequeue()
{
if (_queued_p) {
_queued_p = false;
--_g->_in_queue;
}
}

inline void
ConnectionTracker::TxnState::clear()
{
if (_g) {
this->dequeue();
this->release();
_g = nullptr;
}
Expand Down
3 changes: 0 additions & 3 deletions src/proxy/http/HttpSM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5884,9 +5884,6 @@ HttpSM::handle_post_failure()
void
HttpSM::handle_http_server_open()
{
// The request is now not queued. This is important because server retries reuse the t_state.
t_state.outbound_conn_track_state.dequeue();

Comment on lines -5887 to -5889
Copy link
Copy Markdown
Contributor Author

@bneradt bneradt Nov 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might seem like a concerning removal of a use of dequeue, but note that enqueue was never called. Thus this call was always a no-op.

// [bwyatt] applying per-transaction OS netVC options here
// IFF they differ from the netVC's current options.
// This should keep this from being redundant on a
Expand Down