diff --git a/CHANGES.txt b/CHANGES.txt index bb93d9d802..4876e6ace0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -20,6 +20,7 @@ Merged from 4.1: * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) Merged from 4.0: + * 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) * Skip version check if an endpoint is dead state in Gossiper#upgradeFromVersionSupplier (CASSANDRA-19187) diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index e842ba7495..4f24babbb1 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -1478,8 +1478,6 @@ public class StorageProxy implements StorageProxyMBean Replica localReplica = null; Collection endpointsToHint = null; - List backPressureHosts = null; - // For performance, Mutation caches serialized buffers that are computed lazily in serializedBuffer(). That // computation is not synchronized however and we will potentially call that method concurrently for each // dispatched message (not that concurrent calls to serializedBuffer() are "unsafe" per se, just that they @@ -1528,11 +1526,6 @@ public class StorageProxy implements StorageProxyMBean messages.add(destination); } - - if (backPressureHosts == null) - backPressureHosts = new ArrayList<>(plan.contacts().size()); - - backPressureHosts.add(destination.endpoint()); } } else