From 082ea28cd7286e9882e60913444b322ea691fc3d Mon Sep 17 00:00:00 2001 From: Vijay Parthasarathy Date: Fri, 1 Feb 2013 11:30:31 -0800 Subject: [PATCH 1/3] Unable to start when using Ec2Snitch Patch by Vijay, reviewed by Brandon Williams for CASSANDRA-5212 --- .../cassandra/locator/GossipingPropertyFileSnitch.java | 2 +- src/java/org/apache/cassandra/locator/SnitchProperties.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java index 72c9bb8a59..0674cfa334 100644 --- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java +++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java @@ -45,7 +45,7 @@ public class GossipingPropertyFileSnitch extends AbstractNetworkTopologySnitch myDC = SnitchProperties.get("dc", null); myRack = SnitchProperties.get("rack", null); if (myDC == null || myRack == null) - throw new ConfigurationException("DC or rack not found in snitch properties"); + throw new ConfigurationException("DC or rack not found in snitch properties, Plz check your configuration in: " + SnitchProperties.RACKDC_PROPERTY_FILENAME); try { psnitch = new PropertyFileSnitch(); diff --git a/src/java/org/apache/cassandra/locator/SnitchProperties.java b/src/java/org/apache/cassandra/locator/SnitchProperties.java index 16989ff6ff..a71decdabe 100644 --- a/src/java/org/apache/cassandra/locator/SnitchProperties.java +++ b/src/java/org/apache/cassandra/locator/SnitchProperties.java @@ -21,9 +21,11 @@ import java.io.InputStream; import java.util.Properties; import org.apache.cassandra.io.util.FileUtils; +import org.apache.log4j.Logger; public class SnitchProperties { + private static final Logger logger = LoggerFactory.getLogger(GossipingPropertyFileSnitch.class); public static final String RACKDC_PROPERTY_FILENAME = "cassandra-rackdc.properties"; private static Properties properties = new Properties(); @@ -36,7 +38,8 @@ public class SnitchProperties } catch (Exception e) { - throw new RuntimeException("Unable to read " + RACKDC_PROPERTY_FILENAME, e); + // do not throw exception here, just consider this a incomplete or a empty property file. + logger.warn("Unable to read " + RACKDC_PROPERTY_FILENAME); } finally { From 60d0a1220f61fce8db0bf626c38cf3639b996c70 Mon Sep 17 00:00:00 2001 From: Vijay Parthasarathy Date: Fri, 1 Feb 2013 11:34:15 -0800 Subject: [PATCH 2/3] Add cassandra-rackdc.properties to debian package Patch by Vijay, reviewed by Brandon Williams for CASSANDRA-5212 --- debian/cassandra.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/cassandra.install b/debian/cassandra.install index 8e3c20c690..1f10009041 100644 --- a/debian/cassandra.install +++ b/debian/cassandra.install @@ -1,6 +1,7 @@ conf/log4j-server.properties etc/cassandra conf/cassandra.yaml etc/cassandra conf/cassandra-env.sh etc/cassandra +conf/cassandra-rackdc.properties etc/cassandra debian/cassandra.in.sh usr/share/cassandra debian/cassandra.conf etc/security/limits.d debian/cassandra-sysctl.conf etc/sysctl.d From ddab67d37bb9ebd8ca3a14180cea78e8a45c381a Mon Sep 17 00:00:00 2001 From: Vijay Parthasarathy Date: Fri, 1 Feb 2013 12:25:58 -0800 Subject: [PATCH 3/3] Commiting missing imports --- src/java/org/apache/cassandra/locator/SnitchProperties.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/java/org/apache/cassandra/locator/SnitchProperties.java b/src/java/org/apache/cassandra/locator/SnitchProperties.java index a71decdabe..ae27fbe913 100644 --- a/src/java/org/apache/cassandra/locator/SnitchProperties.java +++ b/src/java/org/apache/cassandra/locator/SnitchProperties.java @@ -21,7 +21,8 @@ import java.io.InputStream; import java.util.Properties; import org.apache.cassandra.io.util.FileUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SnitchProperties {