This is an automated email from the ASF dual-hosted git repository.
shinrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new d359ccd Remove ssl_error stats that aren't really errors.
d359ccd is described below
commit d359ccd6bf70f5c91b16a1258ce593de2daee687
Author: Susan Hinrichs <[email protected]>
AuthorDate: Mon Aug 5 21:03:48 2019 +0000
Remove ssl_error stats that aren't really errors.
---
.../monitoring/statistics/core/ssl.en.rst | 12 ------------
iocore/net/SSLNetVConnection.cc | 20 --------------------
iocore/net/SSLStats.cc | 8 --------
iocore/net/SSLStats.h | 5 -----
4 files changed, 45 deletions(-)
diff --git a/doc/admin-guide/monitoring/statistics/core/ssl.en.rst
b/doc/admin-guide/monitoring/statistics/core/ssl.en.rst
index f89969d..34e35a9 100644
--- a/doc/admin-guide/monitoring/statistics/core/ssl.en.rst
+++ b/doc/admin-guide/monitoring/statistics/core/ssl.en.rst
@@ -83,18 +83,6 @@ SSL/TLS
.. ts:stat:: global proxy.process.ssl.ssl_error_syscall integer
:type: counter
-.. ts:stat:: global proxy.process.ssl.ssl_error_want_read integer
- :type: counter
-
-.. ts:stat:: global proxy.process.ssl.ssl_error_want_write integer
- :type: counter
-
-.. ts:stat:: global proxy.process.ssl.ssl_error_want_x509_lookup integer
- :type: counter
-
-.. ts:stat:: global proxy.process.ssl.ssl_error_zero_return integer
- :type: counter
-
.. ts:stat:: global proxy.process.ssl.ssl_session_cache_eviction integer
:type: counter
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 2236843..0c374e1 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -255,24 +255,20 @@ ssl_read_from_net(SSLNetVConnection *sslvc, EThread
*lthread, int64_t &ret)
break;
case SSL_ERROR_WANT_WRITE:
event = SSL_WRITE_WOULD_BLOCK;
- SSL_INCREMENT_DYN_STAT(ssl_error_want_write);
Debug("ssl.error", "SSL_ERROR_WOULD_BLOCK(write)");
break;
case SSL_ERROR_WANT_READ:
event = SSL_READ_WOULD_BLOCK;
- SSL_INCREMENT_DYN_STAT(ssl_error_want_read);
Debug("ssl.error", "SSL_ERROR_WOULD_BLOCK(read)");
break;
#ifdef SSL_ERROR_WANT_CLIENT_HELLO_CB
case SSL_ERROR_WANT_CLIENT_HELLO_CB:
event = SSL_READ_WOULD_BLOCK;
- SSL_INCREMENT_DYN_STAT(ssl_error_want_client_hello_cb);
Debug("ssl.error", "SSL_ERROR_WOULD_BLOCK(read/client hello cb)");
break;
#endif
case SSL_ERROR_WANT_X509_LOOKUP:
event = SSL_READ_WOULD_BLOCK;
- SSL_INCREMENT_DYN_STAT(ssl_error_want_x509_lookup);
Debug("ssl.error", "SSL_ERROR_WOULD_BLOCK(read/x509 lookup)");
break;
case SSL_ERROR_SYSCALL:
@@ -290,7 +286,6 @@ ssl_read_from_net(SSLNetVConnection *sslvc, EThread
*lthread, int64_t &ret)
break;
case SSL_ERROR_ZERO_RETURN:
event = SSL_READ_EOS;
- SSL_INCREMENT_DYN_STAT(ssl_error_zero_return);
Debug("ssl.error", "SSL_ERROR_ZERO_RETURN");
break;
case SSL_ERROR_SSL:
@@ -804,7 +799,6 @@ SSLNetVConnection::load_buffer_and_write(int64_t towrite,
MIOBufferAccessor &buf
case SSL_ERROR_WANT_READ:
needs |= EVENTIO_READ;
num_really_written = -EAGAIN;
- SSL_INCREMENT_DYN_STAT(ssl_error_want_read);
Debug("ssl.error", "SSL_write-SSL_ERROR_WANT_READ");
break;
case SSL_ERROR_WANT_WRITE:
@@ -813,16 +807,8 @@ SSLNetVConnection::load_buffer_and_write(int64_t towrite,
MIOBufferAccessor &buf
#endif
case SSL_ERROR_WANT_X509_LOOKUP: {
if (SSL_ERROR_WANT_WRITE == err) {
- SSL_INCREMENT_DYN_STAT(ssl_error_want_write);
redoWriteSize = l;
- } else if (SSL_ERROR_WANT_X509_LOOKUP == err) {
- SSL_INCREMENT_DYN_STAT(ssl_error_want_x509_lookup);
}
-#ifdef SSL_ERROR_WANT_CLIENT_HELLO_CB
- else if (SSL_ERROR_WANT_CLIENT_HELLO_CB == err) {
- SSL_INCREMENT_DYN_STAT(ssl_error_want_client_hello_cb);
- }
-#endif
needs |= EVENTIO_WRITE;
num_really_written = -EAGAIN;
Debug("ssl.error", "SSL_write-SSL_ERROR_WANT_WRITE");
@@ -836,7 +822,6 @@ SSLNetVConnection::load_buffer_and_write(int64_t towrite,
MIOBufferAccessor &buf
// end of stream
case SSL_ERROR_ZERO_RETURN:
num_really_written = -errno;
- SSL_INCREMENT_DYN_STAT(ssl_error_zero_return);
Debug("ssl.error", "SSL_write-SSL_ERROR_ZERO_RETURN");
break;
case SSL_ERROR_SSL:
@@ -1413,21 +1398,17 @@ SSLNetVConnection::sslClientHandShakeEvent(int &err)
case SSL_ERROR_WANT_WRITE:
Debug("ssl.error", "SSL_ERROR_WANT_WRITE");
- SSL_INCREMENT_DYN_STAT(ssl_error_want_write);
return SSL_HANDSHAKE_WANT_WRITE;
case SSL_ERROR_WANT_READ:
- SSL_INCREMENT_DYN_STAT(ssl_error_want_read);
Debug("ssl.error", "SSL_ERROR_WANT_READ");
return SSL_HANDSHAKE_WANT_READ;
#ifdef SSL_ERROR_WANT_CLIENT_HELLO_CB
case SSL_ERROR_WANT_CLIENT_HELLO_CB:
- SSL_INCREMENT_DYN_STAT(ssl_error_want_client_hello_cb);
Debug("ssl.error", "SSL_ERROR_WANT_CLIENT_HELLO_CB");
break;
#endif
case SSL_ERROR_WANT_X509_LOOKUP:
- SSL_INCREMENT_DYN_STAT(ssl_error_want_x509_lookup);
Debug("ssl.error", "SSL_ERROR_WANT_X509_LOOKUP");
break;
@@ -1438,7 +1419,6 @@ SSLNetVConnection::sslClientHandShakeEvent(int &err)
break;
case SSL_ERROR_ZERO_RETURN:
- SSL_INCREMENT_DYN_STAT(ssl_error_zero_return);
Debug("ssl.error", "EOS");
return EVENT_ERROR;
diff --git a/iocore/net/SSLStats.cc b/iocore/net/SSLStats.cc
index 5b466c5..1a769d4 100644
--- a/iocore/net/SSLStats.cc
+++ b/iocore/net/SSLStats.cc
@@ -178,18 +178,10 @@ SSLInitializeStatistics()
(int)ssl_total_dyn_redo_tls_record_count,
RecRawStatSyncCount);
/* error stats */
- RecRegisterRawStat(ssl_rsb, RECT_PROCESS,
"proxy.process.ssl.ssl_error_want_write", RECD_COUNTER, RECP_PERSISTENT,
- (int)ssl_error_want_write, RecRawStatSyncCount);
- RecRegisterRawStat(ssl_rsb, RECT_PROCESS,
"proxy.process.ssl.ssl_error_want_read", RECD_COUNTER, RECP_PERSISTENT,
- (int)ssl_error_want_read, RecRawStatSyncCount);
- RecRegisterRawStat(ssl_rsb, RECT_PROCESS,
"proxy.process.ssl.ssl_error_want_x509_lookup", RECD_COUNTER, RECP_PERSISTENT,
- (int)ssl_error_want_x509_lookup, RecRawStatSyncCount);
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_zero_return", RECD_COUNTER, RECP_PERSISTENT,
- (int)ssl_error_zero_return, 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_sni_name_set_failure", RECD_COUNTER, RECP_PERSISTENT,
diff --git a/iocore/net/SSLStats.h b/iocore/net/SSLStats.h
index 66dbeff..2ad0ce0 100644
--- a/iocore/net/SSLStats.h
+++ b/iocore/net/SSLStats.h
@@ -85,13 +85,8 @@ enum SSL_Stats {
ssl_session_cache_new_session,
/* error stats */
- ssl_error_want_write,
- ssl_error_want_read,
- ssl_error_want_client_hello_cb,
- ssl_error_want_x509_lookup,
ssl_error_syscall,
ssl_error_read_eos,
- ssl_error_zero_return,
ssl_error_ssl,
ssl_sni_name_set_failure,
ssl_total_success_handshake_count_out_stat,
