Skip to content

Increment ssl_error_syscall only if not EOF #7225

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
masaori335 merged 1 commit into from
Sep 29, 2020
Merged

Increment ssl_error_syscall only if not EOF #7225

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
4 changes: 0 additions & 4 deletions doc/admin-guide/monitoring/statistics/core/ssl.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ SSL/TLS
The number of SSL connections to origin servers which were terminated due to
unsupported SSL/TLS protocol versions, since statistics collection began.

.. ts:stat:: global proxy.process.ssl.ssl_error_read_eos integer
:type: counter

.. ts:stat:: global proxy.process.ssl.ssl_error_ssl integer
:type: counter

Expand Down Expand Up @@ -229,4 +226,3 @@ SSL/TLS

Incoming client SSL connections terminated due to an unsupported or disabled
version of SSL/TLS, since statistics collection began.

3 changes: 1 addition & 2 deletions iocore/net/SSLNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,15 +306,14 @@ ssl_read_from_net(SSLNetVConnection *sslvc, EThread *lthread, int64_t &ret)
Debug("ssl.error", "SSL_ERROR_WOULD_BLOCK(read/x509 lookup)");
break;
case SSL_ERROR_SYSCALL:
SSL_INCREMENT_DYN_STAT(ssl_error_syscall);
if (nread != 0) {
// not EOF
SSL_INCREMENT_DYN_STAT(ssl_error_syscall);
event = SSL_READ_ERROR;
ret = errno;
Debug("ssl.error", "SSL_ERROR_SYSCALL, underlying IO error: %s", strerror(errno));
} else {
// then EOF observed, treat it as EOS
Copy link
Contributor

@bryancall bryancall Sep 29, 2020

Choose a reason for hiding this comment

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

Do we want to track EOS here?

Copy link
Contributor Author

@masaori335 masaori335 Sep 29, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Actually, it's my first idea. But I decided to do nothing to follow what we did for SSL_ERROR_WANT_WRITE, SSL_ERROR_WANT_READ, and SSL_ERROR_ZERO_RETURN at #5389.

Copy link
Contributor Author

@masaori335 masaori335 Sep 29, 2020

Choose a reason for hiding this comment

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

If we really need these stats, let's restore all of them with renaming.

// Error("[SSL_NetVConnection::ssl_read_from_net] SSL_ERROR_SYSCALL, EOF observed violating SSL protocol");
event = SSL_READ_EOS;
}
break;
Expand Down
2 changes: 0 additions & 2 deletions iocore/net/SSLStats.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,6 @@ SSLInitializeStatistics()
// error stats
RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.ssl_error_syscall", RECD_COUNTER, RECP_PERSISTENT,
(int)ssl_error_syscall, RecRawStatSyncCount);
RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.ssl_error_read_eos", RECD_COUNTER, RECP_PERSISTENT,
(int)ssl_error_read_eos, RecRawStatSyncCount);
RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.ssl_error_ssl", RECD_COUNTER, RECP_PERSISTENT, (int)ssl_error_ssl,
RecRawStatSyncCount);
RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.ssl_error_async", RECD_COUNTER, RECP_PERSISTENT,
Expand Down
1 change: 0 additions & 1 deletion iocore/net/SSLStats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ enum SSL_Stats {

/* error stats */
ssl_error_syscall,
ssl_error_read_eos,
ssl_error_ssl,
ssl_error_async,
ssl_sni_name_set_failure,
Expand Down