This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 4805123eb8 Merge branch 'cassandra-5.0' into trunk new bcea8f5815 Refactor EncryptionOptions to use client / server encryption options builders new 8fcf309dad Implement appender of slow queries to system_views.slow_queries table The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt | 1 + conf/cassandra.yaml | 4 + conf/logback.xml | 12 + .../configuration/cass_logback_xml_file.adoc | 68 +- .../cassandra/auth/MutualTlsAuthenticator.java | 2 +- .../auth/MutualTlsInternodeAuthenticator.java | 2 +- ...MutualTlsWithPasswordFallbackAuthenticator.java | 2 +- .../config/CassandraRelevantProperties.java | 3 + src/java/org/apache/cassandra/config/Config.java | 2 +- .../cassandra/config/DatabaseDescriptor.java | 14 +- .../apache/cassandra/config/EncryptionOptions.java | 902 +++++++++------------ .../apache/cassandra/config/JMXServerOptions.java | 11 +- .../org/apache/cassandra/db/AbstractReadQuery.java | 12 + .../cassandra/db/monitoring/Monitorable.java | 74 ++ .../cassandra/db/monitoring/MonitoringTask.java | 217 ++++- .../db/virtual/AbstractLoggerVirtualTable.java | 111 +++ .../cassandra/db/virtual/LogMessagesTable.java | 112 +-- .../cassandra/db/virtual/SlowQueriesTable.java | 195 +++++ .../cassandra/db/virtual/SystemViewsKeyspace.java | 1 + .../cassandra/net/InboundConnectionInitiator.java | 4 +- .../cassandra/net/InboundConnectionSettings.java | 2 +- .../cassandra/net/OutboundConnectionInitiator.java | 8 +- .../security/AbstractSslContextFactory.java | 14 +- .../cassandra/security/ISslContextFactory.java | 4 +- .../org/apache/cassandra/security/SSLFactory.java | 12 +- .../apache/cassandra/service/CassandraDaemon.java | 16 +- .../org/apache/cassandra/tools/BulkLoader.java | 2 +- .../org/apache/cassandra/tools/LoaderOptions.java | 39 +- .../org/apache/cassandra/transport/Client.java | 6 +- .../apache/cassandra/transport/SimpleClient.java | 18 +- .../utils/jmx/AbstractJmxSocketFactory.java | 2 +- .../logging/AbstractVirtualTableAppender.java | 144 ++++ .../utils/logging/LogbackLoggingSupport.java | 28 +- .../cassandra/utils/logging/LoggingSupport.java | 8 +- ...assNameFilter.java => SlowQueriesAppender.java} | 30 +- .../utils/logging/VirtualTableAppender.java | 92 +-- .../cassandra/transport/SimpleClientBurnTest.java | 4 +- .../cassandra/transport/SimpleClientPerfTest.java | 8 +- ... => logback-dtest_with_slow_query_appender.xml} | 11 +- ...ack-dtest_with_slow_query_appender_invalid.xml} | 14 +- .../cassandra/distributed/impl/IsolatedJmx.java | 32 +- .../test/AbstractEncryptionOptionsImpl.java | 15 +- ...Test.java => AbstractVirtualLogsTableTest.java} | 14 +- .../distributed/test/SlowQueriesAppenderTest.java | 73 ++ .../distributed/test/SlowQueryDeserTest.java | 66 ++ .../distributed/test/VirtualTableLogsTest.java | 44 +- .../org/apache/cassandra/auth/AuthConfigTest.java | 7 +- .../cassandra/auth/MutualTlsAuthenticatorTest.java | 14 +- .../auth/MutualTlsInternodeAuthenticatorTest.java | 13 +- ...alTlsWithPasswordFallbackAuthenticatorTest.java | 6 +- .../auth/jmx/JMXAuthJMXServerOptionsTest.java | 2 +- .../config/EncryptionOptionsEqualityTest.java | 114 +-- .../cassandra/config/EncryptionOptionsTest.java | 124 +-- test/unit/org/apache/cassandra/cql3/CQLTester.java | 18 +- ...st.java => AbstractLoggerVirtualTableTest.java} | 124 +-- .../cassandra/db/virtual/LogMessagesTableTest.java | 144 +--- .../cassandra/db/virtual/SettingsTableTest.java | 30 +- .../cassandra/db/virtual/SlowQueriesTableTest.java | 145 ++++ .../org/apache/cassandra/net/ConnectionTest.java | 10 +- .../org/apache/cassandra/net/HandshakeTest.java | 35 +- .../apache/cassandra/net/MessagingServiceTest.java | 51 +- .../security/DefaultSslContextFactoryTest.java | 47 +- .../security/DummySslContextFactoryImpl.java | 4 +- .../security/FileBasedSslContextFactoryTest.java | 48 +- .../security/PEMBasedSslContextFactoryTest.java | 36 +- .../apache/cassandra/security/SSLFactoryTest.java | 189 +++-- .../cassandra/service/ClientWarningsTest.java | 6 +- .../service/NativeTransportServiceTest.java | 18 +- .../cassandra/service/ProtocolBetaVersionTest.java | 4 +- .../apache/cassandra/tools/LoaderOptionsTest.java | 30 + .../transport/EarlyAuthenticationTest.java | 23 +- .../cassandra/transport/MessagePayloadTest.java | 2 +- .../transport/SimpleClientSslContextFactory.java | 8 +- .../apache/cassandra/transport/TlsTestUtils.java | 13 +- .../stress/settings/SettingsTransport.java | 31 +- .../cassandra/stress/settings/StressSettings.java | 2 +- .../cassandra/stress/util/JavaDriverClient.java | 12 +- 77 files changed, 2290 insertions(+), 1475 deletions(-) create mode 100644 src/java/org/apache/cassandra/db/virtual/AbstractLoggerVirtualTable.java create mode 100644 src/java/org/apache/cassandra/db/virtual/SlowQueriesTable.java create mode 100644 src/java/org/apache/cassandra/utils/logging/AbstractVirtualTableAppender.java copy src/java/org/apache/cassandra/utils/logging/{ClassNameFilter.java => SlowQueriesAppender.java} (50%) copy test/conf/{logback-dtest_with_vtable_appender.xml => logback-dtest_with_slow_query_appender.xml} (88%) copy test/conf/{logback-dtest_with_vtable_appender_invalid.xml => logback-dtest_with_slow_query_appender_invalid.xml} (86%) copy test/distributed/org/apache/cassandra/distributed/test/{ReadRepairEmptyRangeTombstonesWithFlushesTest.java => AbstractVirtualLogsTableTest.java} (75%) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/SlowQueriesAppenderTest.java create mode 100644 test/distributed/org/apache/cassandra/distributed/test/SlowQueryDeserTest.java copy test/unit/org/apache/cassandra/db/virtual/{LogMessagesTableTest.java => AbstractLoggerVirtualTableTest.java} (55%) create mode 100644 test/unit/org/apache/cassandra/db/virtual/SlowQueriesTableTest.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org