You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/11/03 18:00:55 UTC
[2/6] git commit: Improve client notification that nodes are ready
for requests
Improve client notification that nodes are ready for requests
Patch by Brandon Williams, reviewed by thobbs for CASSANDRA-7510
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5548bf45
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5548bf45
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5548bf45
Branch: refs/heads/cassandra-2.1
Commit: 5548bf45e9b2cc61cbc131022b3df10924d88a95
Parents: ef14f51
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 10:59:07 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 10:59:07 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageService.java | 13 ++++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5548bf45/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4387d81..0ec3ff1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Improve client notification that nodes are ready for requests (CASSANDRA-7510)
* Handle negative timestamp in writetime method (CASSANDRA-8139)
* Pig: Remove errant LIMIT clause in CqlNativeStorage (CASSANDRA-8166)
* Throw ConfigurationException when hsha is used with the default
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5548bf45/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 4973e40..1f831b9 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1616,6 +1616,14 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
subscriber.onMove(endpoint);
}
}
+ else
+ {
+ if (!isClientMode)
+ {
+ for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
+ subscriber.onJoinCluster(endpoint);
+ }
+ }
PendingRangeCalculatorService.instance.update();
}
@@ -1982,11 +1990,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
subscriber.onUp(endpoint);
}
- else
- {
- for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
- subscriber.onJoinCluster(endpoint);
- }
}
public void onRemove(InetAddress endpoint)