Trim dc/rack names in [G]PFS Patch by Alexey Zotov, reviewed by brandonwilliams for CASSANDRA-5165
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/551da4cf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/551da4cf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/551da4cf Branch: refs/heads/trunk Commit: 551da4cfa5448d076edc529596c73f9180a60c6d Parents: 2dc4448 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Jan 16 14:44:38 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Jan 16 14:45:30 2013 -0600 ---------------------------------------------------------------------- .../locator/GossipingPropertyFileSnitch.java | 2 ++ .../cassandra/locator/PropertyFileSnitch.java | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/551da4cf/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java index 87a61f5..db80b23 100644 --- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java +++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java @@ -48,6 +48,8 @@ public class GossipingPropertyFileSnitch extends AbstractNetworkTopologySnitch myRack = SnitchProperties.get("rack", null); if (myDC == null || myRack == null) throw new ConfigurationException("DC or rack not found in snitch properties"); + myDC = myDC.trim(); + myRack = myRack.trim(); try { psnitch = new PropertyFileSnitch(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/551da4cf/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java index e99fedf..7083b5e 100644 --- a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java +++ b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java @@ -157,8 +157,9 @@ public class PropertyFileSnitch extends AbstractNetworkTopologySnitch { String[] newDefault = value.split(":"); if (newDefault.length < 2) - newDefault = new String[] { "default", "default" }; - defaultDCRack = newDefault; + defaultDCRack = new String[] { "default", "default" }; + else + defaultDCRack = new String[] { newDefault[0].trim(), newDefault[1].trim() }; } else { @@ -175,6 +176,8 @@ public class PropertyFileSnitch extends AbstractNetworkTopologySnitch String[] token = value.split(":"); if (token.length < 2) token = new String[] { "default", "default" }; + else + token = new String[] { token[0].trim(), token[1].trim() }; reloadedMap.put(host, token); } }
