natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-6.0' into trunk 

* cassandra-6.0:
  ninja fix: ensure defaultReadThresholds is cleared for CASSANDRA-21467
This commit is contained in:
Francisco Guerrero 2026-07-27 09:32:56 -05:00
parent 5bf01cc7c0 3cae8aa6f6
commit 4412926e4f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -6,6 +6,7 @@
* Allow nodetool garbagecollect to take a user defined list of SSTables (CASSANDRA-16767) * Allow nodetool garbagecollect to take a user defined list of SSTables (CASSANDRA-16767)
* Add a guardrail for misprepared statements (CASSANDRA-21139) * Add a guardrail for misprepared statements (CASSANDRA-21139)
Merged from 6.0: Merged from 6.0:
* Reduce allocations in DefaultQueryOptions (CASSANDRA-21467)
* Allow unreserved keywords as user and identity names in USER and IDENTITY statements (CASSANDRA-21510) * Allow unreserved keywords as user and identity names in USER and IDENTITY statements (CASSANDRA-21510)
* Reduce allocations in DefaultQueryOptions (CASSANDRA-21467) * Reduce allocations in DefaultQueryOptions (CASSANDRA-21467)
* Reduce number of scheduledTasks on metric id release in ThreadLocalMetrics (CASSANDRA-21475) * Reduce number of scheduledTasks on metric id release in ThreadLocalMetrics (CASSANDRA-21475)

5
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
View File

@ -335,6 +335,7 @@ public class DatabaseDescriptor
private static void clear() private static void clear()
{ {
sstableFormats = null; sstableFormats = null;
defaultReadThresholds = null;
clearMBean("org.apache.cassandra.db:type=DynamicEndpointSnitch"); clearMBean("org.apache.cassandra.db:type=DynamicEndpointSnitch");
clearMBean("org.apache.cassandra.db:type=EndpointSnitchInfo"); clearMBean("org.apache.cassandra.db:type=EndpointSnitchInfo");
clearMBean("org.apache.cassandra.db:type=LocationInfo"); clearMBean("org.apache.cassandra.db:type=LocationInfo");
@ -5606,7 +5607,7 @@ public class DatabaseDescriptor
{ {
logger.info("updating coordinator_read_size_warn_threshold to {}", value); logger.info("updating coordinator_read_size_warn_threshold to {}", value);
conf.coordinator_read_size_warn_threshold = value; conf.coordinator_read_size_warn_threshold = value;
defaultReadThresholds = new QueryOptions.DefaultReadThresholds(value, getCoordinatorReadSizeFailThreshold()); defaultReadThresholds = null;
} }
@Nullable @Nullable
@ -5619,7 +5620,7 @@ public class DatabaseDescriptor
{ {
logger.info("updating coordinator_read_size_fail_threshold to {}", value); logger.info("updating coordinator_read_size_fail_threshold to {}", value);
conf.coordinator_read_size_fail_threshold = value; conf.coordinator_read_size_fail_threshold = value;
defaultReadThresholds = new QueryOptions.DefaultReadThresholds(getCoordinatorReadSizeWarnThreshold(), value); defaultReadThresholds = null;
} }
@Nullable @Nullable