From 8c4a58f035f0d52e36aaba5ae1cf04049ae3dd9c Mon Sep 17 00:00:00 2001 From: maoling Date: Tue, 20 Feb 2024 15:32:28 +0100 Subject: [PATCH] Remove redundant code in StorageProxy#sendToHintedReplicas patch by Ling Mao; reviewed by Stefan Miklosovic, Brandon Williams and Maxwell Guo for CASSANDRA-19412 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index c02043be1a..86b6c18274 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0.13 + * Remove redundant code in StorageProxy#sendToHintedReplicas (CASSANDRA-19412) * Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416) * Add new concurrent_merkle_tree_requests config property to prevent OOM during multi-range and/or multi-table repairs (CASSANDRA-19336) Merged from 3.11: diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index c783caf79c..3e4292ae7b 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -1367,8 +1367,6 @@ public class StorageProxy implements StorageProxyMBean Replica localReplica = null; Collection endpointsToHint = null; - List backPressureHosts = null; - for (Replica destination : plan.contacts()) { checkHintOverload(destination); @@ -1408,11 +1406,6 @@ public class StorageProxy implements StorageProxyMBean messages.add(destination); } - - if (backPressureHosts == null) - backPressureHosts = new ArrayList<>(plan.contacts().size()); - - backPressureHosts.add(destination.endpoint()); } } else