This is an automated email from the ASF dual-hosted git repository. adelapena pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 3e393f2 Merge branch 'cassandra-3.11' into trunk new e5c3d08 Operational improvements and hardening for replica filtering protection patch by Caleb Rackliffe; reviewed by Andrés de la Peña for CASSANDRA-15907 new 2ef1f1c Merge branch 'cassandra-3.0' into cassandra-3.11 new 292650d Merge branch 'cassandra-3.11' into trunk The 3 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 + build.xml | 3 +- conf/cassandra.yaml | 20 + doc/source/operating/metrics.rst | 144 +++---- src/java/org/apache/cassandra/config/Config.java | 2 + .../cassandra/config/DatabaseDescriptor.java | 20 + ...java => ReplicaFilteringProtectionOptions.java} | 17 +- .../db/partitions/PartitionIterators.java | 47 +++ .../org/apache/cassandra/metrics/TableMetrics.java | 21 +- .../apache/cassandra/service/StorageService.java | 28 +- .../cassandra/service/StorageServiceMBean.java | 12 + .../cassandra/service/reads/DataResolver.java | 57 ++- .../service/reads/ReplicaFilteringProtection.java | 444 ++++++++++++--------- .../reads/ShortReadPartitionsProtection.java | 10 +- .../service/reads/ShortReadProtection.java | 17 +- .../service/reads/repair/NoopReadRepair.java | 3 +- .../org/apache/cassandra/transport/Message.java | 2 +- .../cassandra/utils/concurrent/Accumulator.java | 9 +- .../cassandra/distributed/impl/Coordinator.java | 10 + .../apache/cassandra/distributed/impl/RowUtil.java | 7 +- .../test/ReplicaFilteringProtectionTest.java | 244 +++++++++++ .../utils/concurrent/AccumulatorTest.java | 34 +- 22 files changed, 818 insertions(+), 334 deletions(-) copy src/java/org/apache/cassandra/config/{ConfigurationLoader.java => ReplicaFilteringProtectionOptions.java} (69%) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/ReplicaFilteringProtectionTest.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org