Skip to content

Fix logic to support ASYNC_pause_job #4024

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

Fix logic to support ASYNC_pause_job #4024

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
3 changes: 0 additions & 3 deletions iocore/net/P_SSLNetVConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,6 @@ class SSLNetVConnection : public UnixNetVConnection
bool sslTrace = false;
bool SNIMapping = false;
int64_t redoWriteSize = 0;
#ifdef SSL_MODE_ASYNC
EventIO signalep;
#endif
};

typedef int (SSLNetVConnection::*SSLNetVConnHandler)(int, void *);
Expand Down
40 changes: 26 additions & 14 deletions iocore/net/SSLNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ void SSL_set0_rbio(SSL *ssl, BIO *rbio);
#define SSL_HANDSHAKE_WANT_CONNECT 9
#define SSL_WRITE_WOULD_BLOCK 10
#define SSL_WAIT_FOR_HOOK 11
#define SSL_WAIT_FOR_ASYNC 12

ClassAllocator<SSLNetVConnection> sslNetVCAllocator("sslNetVCAllocator");

Expand Down Expand Up @@ -577,7 +578,7 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
nh->read_ready_list.in_or_enqueue(this);
}
}
} else if (ret == SSL_WAIT_FOR_HOOK) {
} else if (ret == SSL_WAIT_FOR_HOOK || ret == SSL_WAIT_FOR_ASYNC) {
// avoid readReschedule - done when the plugin calls us back to reenable
} else {
readReschedule(nh);
Expand Down Expand Up @@ -1129,26 +1130,37 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
#endif
ssl_error_t ssl_error = SSLAccept(ssl);
#if TS_USE_TLS_ASYNC
if (ssl_error == SSL_ERROR_WANT_ASYNC && this->signalep.type == 0) {
if (ssl_error == SSL_ERROR_WANT_ASYNC) {
size_t numfds;
OSSL_ASYNC_FD waitfd;
// Set up the epoll entry for the signalling
if (SSL_get_all_async_fds(ssl, &waitfd, &numfds) && numfds > 0) {
// Temporarily disable regular net
read_disable(nh, this);
this->ep.stop(); // Modify used in read_disable doesn't work for edge triggered epol
// Have to have the read NetState enabled because we are using it for the signal vc
read.enabled = true;
write_disable(nh, this);
PollDescriptor *pd = get_PollDescriptor(this_ethread());
this->signalep.start(pd, waitfd, this, EVENTIO_READ);
this->signalep.type = EVENTIO_READWRITE_VC;
this->ep.start(pd, waitfd, this, EVENTIO_READ);
this->ep.type = EVENTIO_READWRITE_VC;
}
} else
#endif
if (ssl_error == SSL_ERROR_NONE || ssl_error == SSL_ERROR_SSL) {
#if TS_USE_TLS_ASYNC
if (SSLConfigParams::async_handshake_enabled) {
// Clean up the epoll entry for signalling
SSL_clear_mode(ssl, SSL_MODE_ASYNC);
this->signalep.stop();
} else if (SSLConfigParams::async_handshake_enabled) {
// Clean up the epoll entry for signalling
SSL_clear_mode(ssl, SSL_MODE_ASYNC);
this->ep.stop();
// Rectivate the socket, ready to rock
PollDescriptor *pd = get_PollDescriptor(this_ethread());
this->ep.start(
pd, this,
EVENTIO_READ |
EVENTIO_WRITE); // Again we must muck with the eventloop directly because of limits with these methods and edge trigger
if (ssl_error == SSL_ERROR_WANT_READ) {
this->reenable(&read.vio);
this->read.triggered = 1;
}
#endif
}
#endif
bool trace = getSSLTrace();

if (ssl_error != SSL_ERROR_NONE) {
Expand Down Expand Up @@ -1271,7 +1283,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
#if TS_USE_TLS_ASYNC
case SSL_ERROR_WANT_ASYNC:
TraceIn(trace, get_remote_addr(), get_remote_port(), "SSL server handshake ERROR_WANT_ASYNC");
return EVENT_CONT;
return SSL_WAIT_FOR_ASYNC;
#endif

case SSL_ERROR_WANT_ACCEPT:
Expand Down