natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from 0.7 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1065827 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2011-01-31 22:12:43 +00:00
parent 16be8fa7f0 0928a4fd11
commit d00fe774cf
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/cassandra.yaml
View File

@ -225,7 +225,7 @@ rpc_timeout_in_ms: 10000
# org.apache.cassandra.locator.PropertyFileSnitch: # org.apache.cassandra.locator.PropertyFileSnitch:
# - Proximity is determined by rack and data center, which are # - Proximity is determined by rack and data center, which are
# explicitly configured in cassandra-topology.properties. # explicitly configured in cassandra-topology.properties.
endpoint_snitch: org.apache.cassandra.locator.PropertyFileSnitch endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch
# dynamic_snitch -- This boolean controls whether the above snitch is # dynamic_snitch -- This boolean controls whether the above snitch is
# wrapped with a dynamic snitch, which will monitor read latencies # wrapped with a dynamic snitch, which will monitor read latencies

6
src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
View File

@ -55,11 +55,6 @@ import org.apache.cassandra.utils.Mx4jTool;
*/ */
public abstract class AbstractCassandraDaemon implements CassandraDaemon public abstract class AbstractCassandraDaemon implements CassandraDaemon
{ {
public AbstractCassandraDaemon()
{
StorageService.instance.registerDaemon(this);
}
//Initialize logging in such a way that it checks for config changes every 10 seconds. //Initialize logging in such a way that it checks for config changes every 10 seconds.
static static
{ {
@ -183,6 +178,7 @@ public abstract class AbstractCassandraDaemon implements CassandraDaemon
SystemTable.purgeIncompatibleHints(); SystemTable.purgeIncompatibleHints();
// start server internals // start server internals
StorageService.instance.registerDaemon(this);
try try
{ {
StorageService.instance.initServer(); StorageService.instance.initServer();