Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 cccaf7ca2 -> 15bd10afb refs/heads/cassandra-3.11 656cca778 -> 29d6237a0 refs/heads/trunk c09e298a4 -> f109f200a
use zero as default score in DynamicEndpointSnitch Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f109f200 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f109f200 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f109f200 Branch: refs/heads/trunk Commit: f109f200a3a7f6002d7e1f6cc67e9ef5bf5cb2df Parents: c09e298 Author: Dikang Gu <dikan...@gmail.com> Authored: Wed Feb 21 15:48:11 2018 -0800 Committer: Dikang Gu <dikan...@gmail.com> Committed: Tue Mar 20 15:08:36 2018 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java | 2 +- .../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f109f200/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index fbcc1bb..c092a9f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252) * Handle static and partition deletion properly on ThrottledUnfilteredIterator (CASSANDRA-14315) * NodeTool clientstats should show SSL Cipher (CASSANDRA-14322) * Add ability to specify driver name and version (CASSANDRA-14275) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f109f200/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java index b9c9ba0..9ea7e05 100644 --- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java +++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java @@ -235,7 +235,7 @@ public class DynamicEndpointSnitch extends AbstractEndpointSnitch implements ILa { Double score = scores.get(inet); if (score == null) - continue; + score = 0.0; subsnitchOrderedScores.add(score); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f109f200/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java index bf1e4c2..202d7f1 100644 --- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java @@ -100,7 +100,7 @@ public class DynamicEndpointSnitchTest assertEquals(order, dsnitch.getSortedListByProximity(self, Arrays.asList(host1, host2, host3, host4))); setScores(dsnitch, 20, hosts, 10, 10, 10); - order = Arrays.asList(host1, host2, host3, host4); + order = Arrays.asList(host4, host1, host2, host3); assertEquals(order, dsnitch.getSortedListByProximity(self, Arrays.asList(host1, host2, host3, host4))); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
