This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 615aa04edf Reintroduce CASSANDRA-17411 in trunk
615aa04edf is described below
commit 615aa04edfdccf25f37a8fc30dd94029e7ab9d35
Author: Marcus Eriksson <marc...@apache.org>
AuthorDate: Wed Mar 5 11:59:37 2025 +0100
Reintroduce CASSANDRA-17411 in trunk
Patch by marcuse; reviewed by Caleb Rackliffe and Sam Tunnicliffe for
CASSANDRA-19346
---
CHANGES.txt | 1 +
src/java/org/apache/cassandra/locator/ReplicaPlans.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 324af6e281..98389b77cc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
5.1
+ * Reintroduce CASSANDRA-17411 in trunk (CASSANDRA-19346)
* Add min/max/mean/percentiles to timer metrics vtable (CASSANDRA-20466)
* Add support for time, date, timestamp types in scalar constraint
(CASSANDRA-20274)
* Add regular expression constraint (CASSANDRA-20275)
diff --git a/src/java/org/apache/cassandra/locator/ReplicaPlans.java
b/src/java/org/apache/cassandra/locator/ReplicaPlans.java
index 62b7f0ca2d..b6a03b683b 100644
--- a/src/java/org/apache/cassandra/locator/ReplicaPlans.java
+++ b/src/java/org/apache/cassandra/locator/ReplicaPlans.java
@@ -234,10 +234,11 @@ public class ReplicaPlans
EndpointsForToken replicas =
metadata.placements.get(keyspace.getMetadata().params.replication).reads.forToken(key.getToken()).get();
// CASSANDRA-13043: filter out those endpoints not accepting clients
yet, maybe because still bootstrapping
- // TODO: replace this with JOINED state.
- // TODO don't forget adding replicas = replicas.filter(replica ->
FailureDetector.instance.isAlive(replica.endpoint())); after rebase (from
CASSANDRA-17411)
replicas = replicas.filter(replica ->
StorageService.instance.isRpcReady(replica.endpoint()));
+ // CASSANDRA-17411: filter out endpoints that are not alive
+ replicas = replicas.filter(replica ->
FailureDetector.instance.isAlive(replica.endpoint()));
+
// TODO have a way to compute the consistency level
if (replicas.isEmpty())
throw UnavailableException.create(cl,
cl.blockFor(replicationStrategy), 0);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
