Skip to content

Add logic to clean up vios on HttpSM shutdown #4020

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 1 commit into from
Aug 1, 2018
Merged

Add logic to clean up vios on HttpSM shutdown #4020

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
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 @@ -218,7 +218,7 @@ Http1ClientSession::new_connection(NetVConnection *new_vc, MIOBuffer *iobuf, IOB
VIO *
Http1ClientSession::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
{
return client_vc->do_io_read(c, nbytes, buf);
return (client_vc) ? client_vc->do_io_read(c, nbytes, buf) : nullptr;
Copy link
Member

@SolidWallOfCode SolidWallOfCode Aug 1, 2018

Choose a reason for hiding this comment

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

Why the parentheses around client_vc?

}

VIO *
Expand Down
45 changes: 36 additions & 9 deletions proxy/http/HttpSM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,18 @@ std::atomic<int64_t> next_sm_id(0);

ClassAllocator<HttpSM> httpSMAllocator("httpSMAllocator");

HttpVCTable::HttpVCTable()
HttpVCTable::HttpVCTable(HttpSM *mysm)
{
memset(&vc_table, 0, sizeof(vc_table));
sm = mysm;
Copy link
Member

@SolidWallOfCode SolidWallOfCode Aug 1, 2018

Choose a reason for hiding this comment

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

Use member initializer. E.g.
HttpVCTable::HttpVCTable(HttpSM *state_machine) : sm(state_machine)

}

HttpVCTableEntry *
HttpVCTable::new_entry()
{
for (int i = 0; i < vc_table_max_entries; i++) {
if (vc_table[i].vc == nullptr) {
vc_table[i].sm = sm;
return vc_table + i;
}
}
Expand Down Expand Up @@ -191,6 +193,26 @@ HttpVCTable::remove_entry(HttpVCTableEntry *e)
free_MIOBuffer(e->write_buffer);
e->write_buffer = nullptr;
}
if (e->read_vio != nullptr && e->read_vio->cont == sm) {
// Cleanup dangling i/o
if (e == sm->get_ua_entry() && sm->get_ua_txn() != nullptr) {
e->read_vio = sm->get_ua_txn()->do_io_read(nullptr, 0, nullptr);
} else if (e == sm->get_server_entry() && sm->get_server_session()) {
e->read_vio = sm->get_server_session()->do_io_read(nullptr, 0, nullptr);
} else {
ink_release_assert(false);
}
}
if (e->write_vio != nullptr && e->write_vio->cont == sm) {
// Cleanup dangling i/o
if (e == sm->get_ua_entry() && sm->get_ua_txn()) {
e->write_vio = sm->get_ua_txn()->do_io_write(nullptr, 0, nullptr);
} else if (e == sm->get_server_entry() && sm->get_server_session()) {
e->write_vio = sm->get_server_session()->do_io_write(nullptr, 0, nullptr);
} else {
ink_release_assert(false);
}
}
e->read_vio = nullptr;
e->write_vio = nullptr;
e->vc_handler = nullptr;
Expand Down Expand Up @@ -258,9 +280,8 @@ HttpVCTable::cleanup_all()
default_handler = _h; \
}

HttpSM::HttpSM() : Continuation(nullptr)
HttpSM::HttpSM() : Continuation(nullptr), vc_table(this)
{
ink_zero(vc_table);
ink_zero(http_parser);
}

Expand Down Expand Up @@ -1753,8 +1774,9 @@ HttpSM::state_http_server_open(int event, void *data)
do_http_server_open();
}
break;
case VC_EVENT_ERROR:
case VC_EVENT_INACTIVITY_TIMEOUT:
case VC_EVENT_ACTIVE_TIMEOUT:
Copy link
Member

@SolidWallOfCode SolidWallOfCode Jul 31, 2018

Choose a reason for hiding this comment

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

Where was VC_EVENT_ACTIVE_TIMEOUT handled before? Or was it not handled?

Copy link
Member Author

@shinrich shinrich Jul 31, 2018

Choose a reason for hiding this comment

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

The active timeout was not handled before. Ran across it while debugging the ASYNC job. Should be handled here. I can pull it into a separate PR if necessary.

case VC_EVENT_ERROR:
case NET_EVENT_OPEN_FAILED:
t_state.current.state = HttpTransact::CONNECTION_ERROR;
// save the errno from the connect fail for future use (passed as negative value, flip back)
Expand Down Expand Up @@ -2659,7 +2681,10 @@ HttpSM::tunnel_handler_post(int event, void *data)
if (ua_entry->write_buffer) {
free_MIOBuffer(ua_entry->write_buffer);
ua_entry->write_buffer = nullptr;
ua_entry->vc->do_io_write(this, 0, nullptr);
ua_entry->vc->do_io_write(nullptr, 0, nullptr);
}
if (!p->handler_state) {
p->handler_state = HTTP_SM_POST_UA_FAIL;
}
break;
case VC_EVENT_READ_READY:
Expand Down Expand Up @@ -2996,6 +3021,11 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer *p)
ink_assert(p->vc_type == HT_HTTP_SERVER);
ink_assert(p->vc == server_session);

// The server session has been released. Clean all pointer
// Calling remove_entry instead of server_entry because we don't
// want to close the server VC at this point
vc_table.remove_entry(server_entry);

if (close_connection) {
p->vc->do_io_close();
p->read_vio = nullptr;
Expand Down Expand Up @@ -3027,9 +3057,6 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer *p)
}
}

// The server session has been released. Clean all pointer
server_entry->in_tunnel = true; // to avid cleaning in clenup_entry
vc_table.cleanup_entry(server_entry);
server_session = nullptr; // Because p->vc == server_session
server_entry = nullptr;

Expand Down Expand Up @@ -3410,7 +3437,7 @@ HttpSM::tunnel_handler_post_ua(int event, HttpTunnelProducer *p)
// if it is active timeout case, we need to give another chance to send 408 response;
ua_txn->set_active_timeout(HRTIME_SECONDS(t_state.txn_conf->transaction_active_timeout_in));

p->vc->do_io_write(this, 0, nullptr);
p->vc->do_io_write(nullptr, 0, nullptr);
Copy link
Member

@SolidWallOfCode SolidWallOfCode Jul 31, 2018

Choose a reason for hiding this comment

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

Ah, that's how you stop repeat shutdowns.

p->vc->do_io_shutdown(IO_SHUTDOWN_READ);

return 0;
Expand Down
21 changes: 18 additions & 3 deletions proxy/http/HttpSM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,14 @@ struct HttpVCTableEntry {
VIO *write_vio;
HttpSMHandler vc_handler;
HttpVC_t vc_type;
HttpSM *sm;
bool eos;
bool in_tunnel;
};

struct HttpVCTable {
static const int vc_table_max_entries = 4;
HttpVCTable();
HttpVCTable(HttpSM *);

HttpVCTableEntry *new_entry();
HttpVCTableEntry *find_entry(VConnection *);
Expand All @@ -123,6 +124,7 @@ struct HttpVCTable {

private:
HttpVCTableEntry vc_table[vc_table_max_entries];
HttpSM *sm = nullptr;
};

inline bool
Expand Down Expand Up @@ -220,8 +222,9 @@ class HttpSM : public Continuation
virtual void destroy();

static HttpSM *allocate();
HttpCacheSM &get_cache_sm(); // Added to get the object of CacheSM YTS Team, yamsat
HttpVCTableEntry *get_ua_entry(); // Added to get the ua_entry pointer - YTS-TEAM
HttpCacheSM &get_cache_sm(); // Added to get the object of CacheSM YTS Team, yamsat
HttpVCTableEntry *get_ua_entry(); // Added to get the ua_entry pointer - YTS-TEAM
HttpVCTableEntry *get_server_entry(); // Added to get the server_entry pointer

void init();

Expand All @@ -240,6 +243,12 @@ class HttpSM : public Continuation
return server_session;
}

ProxyClientTransaction *
get_ua_txn()
{
return ua_txn;
}

// Called by transact. Updates are fire and forget
// so there are no callbacks and are safe to do
// directly from transact
Expand Down Expand Up @@ -635,6 +644,12 @@ HttpSM::get_ua_entry()
return ua_entry;
}

inline HttpVCTableEntry *
HttpSM::get_server_entry()
{
return server_entry;
}

inline HttpSM *
HttpSM::allocate()
{
Expand Down
4 changes: 2 additions & 2 deletions proxy/http/HttpServerSession.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@ HttpServerSession::enable_outbound_connection_tracking(OutboundConnTrack::Group
VIO *
HttpServerSession::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
{
return server_vc->do_io_read(c, nbytes, buf);
return server_vc ? server_vc->do_io_read(c, nbytes, buf) : nullptr;
}

VIO *
HttpServerSession::do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *buf, bool owner)
{
return server_vc->do_io_write(c, nbytes, buf, owner);
return server_vc ? server_vc->do_io_write(c, nbytes, buf, owner) : nullptr;
}

void
Expand Down
12 changes: 10 additions & 2 deletions proxy/http2/Http2ClientSession.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,21 @@ Http2ClientSession::set_upgrade_context(HTTPHdr *h)
VIO *
Http2ClientSession::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
{
return this->client_vc->do_io_read(c, nbytes, buf);
if (client_vc) {
return this->client_vc->do_io_read(c, nbytes, buf);
} else {
return nullptr;
}
}

VIO *
Http2ClientSession::do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *buf, bool owner)
{
return this->client_vc->do_io_write(c, nbytes, buf, owner);
if (client_vc) {
return this->client_vc->do_io_write(c, nbytes, buf, owner);
} else {
return nullptr;
}
}

void
Expand Down