Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 349B4108B8 for ; Sun, 4 May 2014 04:22:20 +0000 (UTC) Received: (qmail 11440 invoked by uid 500); 4 May 2014 04:22:19 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 11416 invoked by uid 500); 4 May 2014 04:22:17 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 11381 invoked by uid 99); 4 May 2014 04:22:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 May 2014 04:22:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 285E589B944; Sun, 4 May 2014 04:22:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Sun, 04 May 2014 04:22:17 -0000 Message-Id: <3ecfe2da30c44d6a9e68de7f94108630@git.apache.org> In-Reply-To: <6d90b3aa8d4842af9f29042fa3186398@git.apache.org> References: <6d90b3aa8d4842af9f29042fa3186398@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 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/trunk Commit: 2e955d4818708ff865898bd0f57a29cb4e93f0a8 Parents: 4233ee4 c454807 Author: Dave Brosius Authored: Sun May 4 00:20:21 2014 -0400 Committer: Dave Brosius 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;