Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e955d48 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e955d48 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e955d48 Branch: refs/heads/cassandra-2.1 Commit: 2e955d4818708ff865898bd0f57a29cb4e93f0a8 Parents: 4233ee4 c454807 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun May 4 00:20:21 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun May 4 00:20:21 2014 -0400 ---------------------------------------------------------------------- .../cassandra/locator/CloudstackSnitch.java | 78 +++++++++++++------- 1 file changed, 51 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e955d48/src/java/org/apache/cassandra/locator/CloudstackSnitch.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/locator/CloudstackSnitch.java index 43ae996,57c973b..0200f0f --- a/src/java/org/apache/cassandra/locator/CloudstackSnitch.java +++ b/src/java/org/apache/cassandra/locator/CloudstackSnitch.java @@@ -83,9 -85,10 +85,10 @@@ public class CloudstackSnitch extends A if (endpoint.equals(FBUtilities.getBroadcastAddress())) return csZoneRack; EndpointState state = Gossiper.instance.getEndpointStateForEndpoint(endpoint); - if (state == null || state.getApplicationState(ApplicationState.RACK) == null) { + if (state == null || state.getApplicationState(ApplicationState.RACK) == null) + { if (savedEndpoints == null) - savedEndpoints = SystemTable.loadDcRackInfo(); + savedEndpoints = SystemKeyspace.loadDcRackInfo(); if (savedEndpoints.containsKey(endpoint)) return savedEndpoints.get(endpoint).get("rack"); return DEFAULT_RACK; @@@ -98,9 -101,10 +101,10 @@@ if (endpoint.equals(FBUtilities.getBroadcastAddress())) return csZoneDc; EndpointState state = Gossiper.instance.getEndpointStateForEndpoint(endpoint); - if (state == null || state.getApplicationState(ApplicationState.DC) == null) { + if (state == null || state.getApplicationState(ApplicationState.DC) == null) + { if (savedEndpoints == null) - savedEndpoints = SystemTable.loadDcRackInfo(); + savedEndpoints = SystemKeyspace.loadDcRackInfo(); if (savedEndpoints.containsKey(endpoint)) return savedEndpoints.get(endpoint).get("data_center"); return DEFAULT_DC;
