This is an automated email from the ASF dual-hosted git repository.

edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 62ac5da78a1b99c7d28d9558954c6dba040d52e1
Merge: 0daf21244f dd08314ed6
Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com>
AuthorDate: Mon Aug 1 20:39:44 2022 -0400

    Merge branch 'cassandra-4.1' into trunk

 CHANGES.txt                                        |  17 +++
 NEWS.txt                                           |  17 ++-
 conf/cassandra.yaml                                |  16 +--
 src/java/org/apache/cassandra/config/Config.java   |  16 +--
 .../org/apache/cassandra/config/Converters.java    |  14 +-
 .../org/apache/cassandra/config/DataRateSpec.java  |  66 ++-------
 .../cassandra/config/DatabaseDescriptor.java       | 148 ++++++++++++++++++---
 .../cassandra/db/compaction/CompactionManager.java |  20 ++-
 .../apache/cassandra/service/StorageService.java   |  82 ++++++++++--
 .../cassandra/service/StorageServiceMBean.java     |  49 ++++++-
 .../apache/cassandra/streaming/StreamManager.java  |  19 ++-
 .../org/apache/cassandra/tools/LoaderOptions.java  |  22 ++-
 src/java/org/apache/cassandra/tools/NodeProbe.java |  51 ++++++-
 .../cassandra/tools/nodetool/CompactionStats.java  |  12 +-
 .../tools/nodetool/GetCompactionThroughput.java    |  21 ++-
 .../tools/nodetool/GetInterDCStreamThroughput.java |  60 +++++++--
 .../tools/nodetool/GetStreamThroughput.java        |  59 ++++++--
 .../tools/nodetool/SetInterDCStreamThroughput.java |  11 +-
 .../tools/nodetool/SetStreamThroughput.java        |  11 +-
 ...ssandra-converters-special-cases-old-names.yaml |   1 +
 test/conf/cassandra-converters-special-cases.yaml  |   1 +
 .../apache/cassandra/config/DataRateSpecTest.java  | 144 +++++++++-----------
 .../config/DatabaseDescriptorRefTest.java          |   2 +-
 .../cassandra/config/DatabaseDescriptorTest.java   |  38 ++++++
 .../LoadOldYAMLBackwardCompatibilityTest.java      |   8 +-
 .../cassandra/config/ParseAndConvertUnitsTest.java |   6 +-
 .../config/YamlConfigurationLoaderTest.java        |  12 +-
 .../unit/org/apache/cassandra/db/KeyCacheTest.java |   4 +-
 .../cassandra/db/virtual/SettingsTableTest.java    |  10 +-
 .../cassandra/streaming/StreamManagerTest.java     |  44 +++---
 .../nodetool/SetGetCompactionThroughputTest.java   |  51 ++++++-
 ...etEntireSSTableInterDCStreamThroughputTest.java |  20 ++-
 .../SetGetEntireSSTableStreamThroughputTest.java   |  20 ++-
 .../SetGetInterDCStreamThroughputTest.java         | 120 +++++++++++++++--
 .../tools/nodetool/SetGetStreamThroughputTest.java | 120 +++++++++++++++--
 .../io/sstable/StressCQLSSTableWriter.java         |  25 +++-
 .../apache/cassandra/stress/CompactionStress.java  |   3 +-
 37 files changed, 1038 insertions(+), 302 deletions(-)

diff --cc CHANGES.txt
index bdeef8172d,e1f6a2dd66..105522af5b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,21 +1,43 @@@
 -4.1-alpha2
 +4.2
 + * Added JMX call to getSSTableCountPerTWCSBucket for TWCS (CASSANDRA-17774)
 + * When doing a host replacement, -Dcassandra.broadcast_interval_ms is used 
to know when to check the ring but checks that the ring wasn't changed in 
-Dcassandra.ring_delay_ms, changes to ring delay should not depend on when we 
publish load stats (CASSANDRA-17776)
 + * When bootstrap fails, CassandraRoleManager may attempt to do read queries 
that fail with "Cannot read from a bootstrapping node", and increments 
unavailables counters (CASSANDRA-17754)
 + * Add guardrail to disallow DROP KEYSPACE commands (CASSANDRA-17767)
 + * Remove ephemeral snapshot marker file and introduce a flag to 
SnapshotManifest (CASSANDRA-16911)
 + * Add a virtual table that exposes currently running queries 
(CASSANDRA-15241)
 + * Allow sstableloader to specify table without relying on path 
(CASSANDRA-16584)
 + * Fix 
TestGossipingPropertyFileSnitch.test_prefer_local_reconnect_on_listen_address 
(CASSANDRA-17700)
 + * Add ByteComparable API (CASSANDRA-6936)
 + * Add guardrail for maximum replication factor (CASSANDRA-17500)
 + * Increment CQLSH to version 6.2.0 for release 4.2 (CASSANDRA-17646)
 + * Adding support to perform certificate based internode authentication 
(CASSANDRA-17661)
 + * Option to disable CDC writes of repaired data (CASSANDRA-17666)
 + * When a node is bootstrapping it gets the whole gossip state but applies in 
random order causing some cases where StorageService will fail causing an 
instance to not show up in TokenMetadata (CASSANDRA-17676)
 + * Add CQLSH command SHOW REPLICAS (CASSANDRA-17577)
 + * Add guardrail to allow disabling of SimpleStrategy (CASSANDRA-17647)
 + * Change default directory permission to 750 in packaging (CASSANDRA-17470)
 + * Adding support for TLS client authentication for internode communication 
(CASSANDRA-17513)
 + * Add new CQL function maxWritetime (CASSANDRA-17425)
 + * Add guardrail for ALTER TABLE ADD / DROP / REMOVE column operations 
(CASSANDRA-17495)
 + * Rename DisableFlag class to EnableFlag on guardrails (CASSANDRA-17544)
 +Merged from 4.1:
+  * Uncomment prepared_statements_cache_size, key_cache_size, 
counter_cache_size, index_summary_capacity which were
+    commented out by mistake in a previous patch
+    Fix breaking change with cache_load_timeout; cache_load_timeout_seconds 
<=0 and cache_load_timeout=0 are equivalent
+    and they both mean disabled
+    Deprecate public method setRate(final double throughputMbPerSec) in 
Compaction Manager in favor of
+    setRateInBytes(final double throughputBytesPerSec)
+    Revert breaking change removal of 
StressCQLSSTableWriter.Builder.withBufferSizeInMB(int size). Deprecate it in 
favor
+    of StressCQLSSTableWriter.Builder.withBufferSizeInMiB(int size)
+    Fix precision issues, add new -m flag (for nodetool/setstreamthroughput, 
nodetool/setinterdcstreamthroughput,
+    nodetool/getstreamthroughput and nodetoo/getinterdcstreamthroughput), add 
new -d flags (nodetool/getstreamthroughput, 
nodetool/getinterdcstreamthroughput, nodetool/getcompactionthroughput)
+    Fix a bug with precision in nodetool/compactionstats
+    Deprecate StorageService methods and add new ones for 
stream_throughput_outbound, inter_dc_stream_throughput_outbound,
+    compaction_throughput_outbound in the JMX MBean 
`org.apache.cassandra.db:type=StorageService`
+    Removed getEntireSSTableStreamThroughputMebibytesPerSec in favor of new 
getEntireSSTableStreamThroughputMebibytesPerSecAsDouble
+    in the JMX MBean `org.apache.cassandra.db:type=StorageService`
+    Removed getEntireSSTableInterDCStreamThroughputMebibytesPerSec in favor of 
getEntireSSTableInterDCStreamThroughputMebibytesPerSecAsDouble
+    in the JMX MBean `org.apache.cassandra.db:type=StorageService` 
(CASSANDRA-17725)
   * Fix sstable_preemptive_open_interval disabled value. 
sstable_preemptive_open_interval = null backward compatible with
     sstable_preemptive_open_interval_in_mb = -1 (CASSANDRA-17737)
   * Remove usages of Path#toFile() in the snapshot apparatus (CASSANDRA-17769)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to