Skip to content

Fix so EOS are delivered to sessions in the pool #7828

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
shinrich merged 3 commits into from
May 14, 2021
Merged

Fix so EOS are delivered to sessions in the pool #7828

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
ddb10ff
Fix so EOS are delivered to sessions in the pool
shinrich May 12, 2021
3326558
The read must be non-zero to be active and catch the EOS
shinrich May 13, 2021
dee7129
Fix shutdown for keep alive slave server session
shinrich May 13, 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
2 changes: 2 additions & 0 deletions proxy/PoolableSession.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ class PoolableSession : public ProxySession

void set_netvc(NetVConnection *newvc);

virtual IOBufferReader *get_reader() = 0;

private:
// Sessions become if authentication headers
// are sent over them
Expand Down
2 changes: 1 addition & 1 deletion proxy/http/Http1ClientSession.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ Http1ClientSession::attach_server_session(PoolableSession *ssession, bool transa
// have it call the client session back. This IO also prevent
// the server net conneciton from calling back a dead sm
SET_HANDLER(&Http1ClientSession::state_keep_alive);
slave_ka_vio = ssession->do_io_read(this, 0, nullptr);
slave_ka_vio = ssession->do_io_read(this, INT64_MAX, ssession->get_reader()->mbuf);
ink_assert(slave_ka_vio != ka_vio);

// Transfer control of the write side as well
Expand Down
2 changes: 1 addition & 1 deletion proxy/http/Http1ServerSession.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class Http1ServerSession : public PoolableSession
void start() override;

void enable_outbound_connection_tracking(OutboundConnTrack::Group *group);
IOBufferReader *get_reader();
IOBufferReader *get_reader() override;
void attach_hostname(const char *hostname);
IpEndpoint const &get_server_ip() const;

Expand Down
4 changes: 3 additions & 1 deletion proxy/http/HttpSessionManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,9 @@ ServerSessionPool::releaseSession(PoolableSession *ss)
// if it closes on us. We will get called back in the
// continuation for this bucket, ensuring we have the lock
// to remove the connection from our lists
ss->do_io_read(this, 0, nullptr);
// Actually need to have a buffer here, otherwise the vc is
// disabled
ss->do_io_read(this, INT64_MAX, ss->get_reader()->mbuf);

// Transfer control of the write side as well
ss->do_io_write(this, 0, nullptr);
Expand Down