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

Merge branch 'cassandra-4.0' into cassandra-4.1

This commit is contained in:
Stefan Miklosovic 2024-02-22 09:57:26 +01:00
parent 6250ba7929 8c4a58f035
commit 5f63b0ade1
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,5 +1,6 @@
4.1.5
Merged from 4.0:
* Remove redundant code in StorageProxy#sendToHintedReplicas (CASSANDRA-19412)
* Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416)
Merged from 3.11:
Merged from 3.0:

7
src/java/org/apache/cassandra/service/StorageProxy.java
View File

@ -1472,8 +1472,6 @@ public class StorageProxy implements StorageProxyMBean
Replica localReplica = null;
Collection<Replica> endpointsToHint = null;
List<InetAddressAndPort> backPressureHosts = null;
for (Replica destination : plan.contacts())
{
checkHintOverload(destination);
@ -1513,11 +1511,6 @@ public class StorageProxy implements StorageProxyMBean
messages.add(destination);
}
if (backPressureHosts == null)
backPressureHosts = new ArrayList<>(plan.contacts().size());
backPressureHosts.add(destination.endpoint());
}
}
else