Author: jbellis
Date: Fri Sep 24 14:10:30 2010
New Revision: 1000877
URL: http://svn.apache.org/viewvc?rev=1000877&view=rev
Log:
fix enabling dynamic snitch. patch by Wouter de Bie; reviewed by jbellis for
CASSANDRA-981
Modified:
cassandra/branches/cassandra-0.6/CHANGES.txt
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=1000877&r1=1000876&r2=1000877&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Fri Sep 24 14:10:30 2010
@@ -30,6 +30,7 @@
exception rather than the ExecutionException wrapper (CASSANDRA-1226)
* RowWarningThresholdInMB=64 in sample configuration
* Close intra-node sockets when connection is broken (CASSANDRA-1528)
+ * Dynamic snitch (CASSANDRA-981)
* RPM packaging spec file (CASSANDRA-786)
@@ -41,7 +42,6 @@
* fix compilation on non-sun JDKs (CASSANDRA-1061)
* remove String.trim() call on row keys in batch mutations (CASSANDRA-1235)
* Log summary of dropped messages instead of spamming log (CASSANDRA-1284)
- * Dynamic snitch (CASSANDRA-981)
* fix streaming for keyspaces with hyphens in their name (CASSANDRA-1377)
* fix errors in hard-coded bloom filter optKPerBucket by computing it
algorithmically (CASSANDRA-1220
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=1000877&r1=1000876&r2=1000877&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Fri Sep 24 14:10:30 2010
@@ -636,11 +636,10 @@ public class DatabaseDescriptor
{
Class cls = Class.forName(endPointSnitchClassName);
IEndPointSnitch snitch =
(IEndPointSnitch)cls.getConstructor().newInstance();
- String dynamic =
System.getProperty("cassandra.dynamic_snitch");
- if (dynamic == null || Boolean.getBoolean(dynamic) ==
false)
- epSnitch = snitch;
- else
+ if (Boolean.getBoolean("cassandra.dynamic_snitch"))
epSnitch = new DynamicEndpointSnitch(snitch);
+ else
+ epSnitch = snitch;
}
catch (ClassNotFoundException e)
{
