You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/08/24 22:21:22 UTC
git commit: finish renaming DFMode -> DFPolicy
Updated Branches:
refs/heads/trunk 44f599866 -> d9c70e1d3
finish renaming DFMode -> DFPolicy
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9c70e1d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9c70e1d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9c70e1d
Branch: refs/heads/trunk
Commit: d9c70e1d321c9428ed618790e6c0b49d6aa0fa13
Parents: 44f5998
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Aug 24 15:21:10 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 24 15:21:10 2012 -0500
----------------------------------------------------------------------
.../cassandra/config/DatabaseDescriptor.java | 4 ++--
.../apache/cassandra/service/CassandraDaemon.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9c70e1d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index ccd2b83..1c389b4 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -199,7 +199,7 @@ public class DatabaseDescriptor
logger.info("DiskAccessMode is " + conf.disk_access_mode + ", indexAccessMode is " + indexAccessMode );
}
- logger.info("DiskFailureMode is " + conf.disk_failure_policy);
+ logger.info("disk_failure_policy is " + conf.disk_failure_policy);
logger.debug("page_cache_hinting is " + conf.populate_io_cache_on_flush);
@@ -998,7 +998,7 @@ public class DatabaseDescriptor
return indexAccessMode;
}
- public static Config.DiskFailurePolicy getDiskFailureMode()
+ public static Config.DiskFailurePolicy getDiskFailurePolicy()
{
return conf.disk_failure_policy;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9c70e1d/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 5a6042b..ed68a1b 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -145,7 +145,7 @@ public class CassandraDaemon
private void handleFSError(FSError e)
{
- switch (DatabaseDescriptor.getDiskFailureMode())
+ switch (DatabaseDescriptor.getDiskFailurePolicy())
{
case stop:
logger.error("Stopping the gossiper and the RPC server");