accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Date Fri, 23 May 2014 20:32:44 GMT
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/conf/Property.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/480634fe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/480634fe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/480634fe

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 480634fe4a8edfeb9f35613f1518bd742012b3d9
Parents: ff3ad73 2526f0a
Author: Josh Elser <elserj@apache.org>
Authored: Fri May 23 16:32:22 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri May 23 16:32:22 2014 -0400

----------------------------------------------------------------------
 core/src/main/java/org/apache/accumulo/core/conf/Property.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/480634fe/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 2ade366,d8f9beb..87a29fb
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -267,14 -206,15 +267,15 @@@ public enum Property 
        "Use the SYNC_BLOCK create flag to sync WAL writes to disk. Prevents problems recovering
from sudden system resets."),
    TSERV_WAL_SYNC_METHOD("tserver.wal.sync.method", "hsync", PropertyType.STRING, "The method
to invoke when sync'ing WALs. HSync will provide " +
        "resiliency in the face of unexpected power outages, at the cost of speed. If method
is not available, the legacy 'sync' method " +
-       "will be used to ensure backwards compatibility with older Hadoop versions"),
-  
+       "will be used to ensure backwards compatibility with older Hadoop versions. A value
of 'hflush' is the alternative to the default value " +
+       "of 'hsync' which will result in faster writes, but with less durability"),
 -  
++
    // properties that are specific to logger server behavior
    LOGGER_PREFIX("logger.", null, PropertyType.PREFIX, "Properties in this category affect
the behavior of the write-ahead logger servers"),
 -  LOGGER_DIR("logger.dir.walog", "walogs", PropertyType.PATH,
 -      "The property only needs to be set if upgrading from 1.4 which used to store write-ahead
logs on the local filesystem. In 1.5 write-ahead logs are "
 -          + "stored in DFS.  When 1.5 is started for the first time it will copy any 1.4
write ahead logs into DFS.  It is possible to specify a "
 -          + "comma-separated list of directories."),
 +  LOGGER_DIR("logger.dir.walog", "walogs", PropertyType.PATH, "This property is only needed
if Accumulo was upgraded from a 1.4 or earlier version. "
 +      + "In the upgrade to 1.5 this property is used to copy any earlier write ahead logs
into DFS. "
 +      + "In 1.6+, this property is used by the LocalWALRecovery utility in the event that
something went wrong with that earlier upgrade. "
 +      + "It is possible to specify a comma-separated list of directories."),
  
    // accumulo garbage collector properties
    GC_PREFIX("gc.", null, PropertyType.PREFIX, "Properties in this category affect the behavior
of the accumulo garbage collector."),


Mime
View raw message