accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [32/32] git commit: Merge remote-tracking branch 'origin/master' into ACCUMULO-378
Date Wed, 28 May 2014 20:52:05 GMT
Merge remote-tracking branch 'origin/master' into ACCUMULO-378

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/58fbf143
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/58fbf143
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/58fbf143

Branch: refs/heads/ACCUMULO-378
Commit: 58fbf1438d2cd82133ca0d559dfb22d8b8f55d7f
Parents: 1f0ee9c 0712ec9
Author: Josh Elser <elserj@apache.org>
Authored: Wed May 28 16:49:48 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Wed May 28 16:49:48 2014 -0400

----------------------------------------------------------------------
 bin/tool.sh                                     |   5 +-
 .../1GB/native-standalone/log4j.properties      |   2 +-
 conf/examples/1GB/standalone/log4j.properties   |   2 +-
 .../2GB/native-standalone/log4j.properties      |   2 +-
 conf/examples/2GB/standalone/log4j.properties   |   2 +-
 .../3GB/native-standalone/log4j.properties      |   2 +-
 conf/examples/3GB/standalone/log4j.properties   |   2 +-
 .../512MB/native-standalone/log4j.properties    |   2 +-
 conf/examples/512MB/standalone/log4j.properties |   2 +-
 conf/templates/log4j.properties                 |   2 +-
 .../core/conf/DefaultConfiguration.java         |   2 +-
 .../org/apache/accumulo/core/conf/Property.java |   4 +
 .../accumulo/core/file/BloomFilterLayer.java    |  19 ++-
 .../core/iterators/AggregatingIterator.java     |   6 +-
 .../aggregation/conf/AggregatorSet.java         |   3 +-
 .../iterators/conf/ColumnToClassMapping.java    |  16 +-
 .../accumulo/core/util/LocalityGroupUtil.java   |   3 +
 .../impl/MiniAccumuloClusterImpl.java           |   8 +
 minicluster/src/main/resources/auditLog.xml     |  41 +++++
 .../master/balancer/TableLoadBalancer.java      |   9 +-
 .../security/AuditedSecurityOperation.java      |   3 +-
 .../java/org/apache/accumulo/master/Master.java |  14 ++
 .../accumulo/monitor/servlets/ShellServlet.java |  43 +++--
 .../apache/accumulo/tserver/log/DfsLogger.java  |  10 +-
 .../classloader/vfs/AccumuloVFSClassLoader.java |  19 +++
 .../accumulo/test/stress/random/DataWriter.java |  50 ++++++
 .../test/stress/random/IntArgValidator.java     |  32 ++++
 .../test/stress/random/RandomByteArrays.java    |  32 ++++
 .../test/stress/random/RandomMutations.java     |  44 +++++
 .../test/stress/random/RandomWithinRange.java   |  59 +++++++
 .../accumulo/test/stress/random/Scan.java       | 124 ++++++++++++++
 .../accumulo/test/stress/random/ScanOpts.java   |  44 +++++
 .../accumulo/test/stress/random/Stream.java     |  41 +++++
 .../accumulo/test/stress/random/Write.java      |  87 ++++++++++
 .../test/stress/random/WriteOptions.java        | 169 +++++++++++++++++++
 .../test/stress/random/package-info.java        |  36 ++++
 test/system/stress/README.md                    |  34 ++++
 test/system/stress/reader.sh                    |  34 ++++
 test/system/stress/writer.sh                    |  40 +++++
 39 files changed, 1013 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/58fbf143/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 2c7e27b,1200fd1..8ad849b
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -272,10 -267,10 +272,14 @@@ public enum Property 
        "The number of threads for the distributed work queue. These threads are used for
copying failed bulk files."),
    TSERV_WAL_SYNC("tserver.wal.sync", "true", PropertyType.BOOLEAN,
        "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. A value
of 'hflush' is the alternative to the default value " +
+       "of 'hsync' which will result in faster writes, but with less durability"),
 +  TSERV_REPLICATION_REPLAYERS("tserver.replication.replayer.", null, PropertyType.PREFIX,
"Allows configuration of implementation used to apply replicated data"),
 +  TSERV_REPLICATION_DEFAULT_HANDLER("tserver.replication.default.replayer", "org.apache.accumulo.tserver.replication.BatchWriterReplicationReplayer",
 +      PropertyType.CLASSNAME, "Default AccumuloReplicationReplayer implementation"),
 +  TSERV_REPLICATION_BW_REPLAYER_MEMORY("tserver.replication.batchwriter.replayer.memory",
"50M", PropertyType.MEMORY, "Memory to provide to batchwriter to replay mutations for replication"),
  
    // 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"),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/58fbf143/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------


Mime
View raw message