accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Tue, 25 Feb 2014 16:23:44 GMT
Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 08f0b9ac1691b1d078a691a2b819df56512aa318
Parents: 5f72696 2ef2d88
Author: Keith Turner <kturner@apache.org>
Authored: Tue Feb 25 11:21:52 2014 -0500
Committer: Keith Turner <kturner@apache.org>
Committed: Tue Feb 25 11:21:52 2014 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/core/conf/Property.java |  12 +-
 .../core/tabletserver/log/LogEntry.java         |  12 +-
 .../chapters/multivolume.tex                    |  46 ++-
 .../apache/accumulo/server/ServerConstants.java | 115 +++++--
 .../accumulo/server/fs/VolumeManager.java       |  99 +++---
 .../accumulo/server/fs/VolumeManagerImpl.java   |  93 +++---
 .../apache/accumulo/server/fs/VolumeUtil.java   | 330 +++++++++++++++++++
 .../apache/accumulo/server/init/Initialize.java |  36 +-
 .../server/master/recovery/HadoopLogCloser.java |   3 +-
 .../org/apache/accumulo/server/util/Admin.java  |  11 +
 .../accumulo/server/util/ListVolumesUsed.java   | 141 ++++++++
 .../accumulo/server/util/MetadataTableUtil.java |  42 ++-
 .../apache/accumulo/server/fs/FileTypeTest.java |  54 +++
 .../accumulo/server/fs/VolumeUtilTest.java      | 144 ++++++++
 .../accumulo/gc/SimpleGarbageCollector.java     |  94 +++---
 .../master/recovery/RecoveryManager.java        |  10 +
 .../monitor/servlets/DefaultServlet.java        |   2 +-
 .../tserver/DirectoryDecommissioner.java        | 169 ----------
 .../org/apache/accumulo/tserver/Tablet.java     |  21 +-
 .../apache/accumulo/tserver/TabletServer.java   |   2 +
 .../tserver/DirectoryDecommissionerTest.java    | 108 ------
 .../tserver/TabletServerSyncCheckTest.java      |  14 +-
 .../org/apache/accumulo/test/CleanWalIT.java    |   3 +-
 .../test/ConfigurableMajorCompactionIT.java     |   3 +-
 .../org/apache/accumulo/test/DumpConfigIT.java  |   3 +-
 .../test/MasterRepairsDualAssignmentIT.java     |   3 +-
 .../accumulo/test/NoMutationRecoveryIT.java     |   8 +-
 .../java/org/apache/accumulo/test/VolumeIT.java | 174 +++++++---
 .../functional/BalanceAfterCommsFailureIT.java  |   3 +-
 .../test/functional/BatchScanSplitIT.java       |   3 +-
 .../test/functional/BigRootTabletIT.java        |   3 +-
 .../test/functional/BinaryStressIT.java         |   3 +-
 .../accumulo/test/functional/BloomFilterIT.java |   3 +-
 .../functional/BulkSplitOptimizationIT.java     |   3 +-
 .../test/functional/ChaoticBalancerIT.java      |   3 +-
 .../accumulo/test/functional/CleanTmpIT.java    |   3 +-
 .../accumulo/test/functional/CompactionIT.java  |   3 +-
 .../accumulo/test/functional/ConcurrencyIT.java |   3 +-
 .../functional/ConfigurableCompactionIT.java    |   3 +-
 .../test/functional/ConfigurableMacIT.java      |  19 +-
 .../test/functional/DeleteEverythingIT.java     |   3 +-
 .../test/functional/DynamicThreadPoolsIT.java   |   3 +-
 .../test/functional/GarbageCollectorIT.java     |   3 +-
 .../test/functional/HalfDeadTServerIT.java      |   3 +-
 .../accumulo/test/functional/LargeRowIT.java    |   3 +-
 .../test/functional/LateLastContactIT.java      |   3 +-
 .../test/functional/MasterFailoverIT.java       |   3 +-
 .../accumulo/test/functional/MaxOpenIT.java     |   3 +-
 .../test/functional/MetadataMaxFiles.java       |   3 +-
 .../test/functional/MetadataSplitIT.java        |   3 +-
 .../accumulo/test/functional/RestartIT.java     |   3 +-
 .../test/functional/RestartStressIT.java        |   5 +-
 .../accumulo/test/functional/RowDeleteIT.java   |   3 +-
 .../test/functional/ScanSessionTimeOutIT.java   |   3 +-
 .../functional/SimpleBalancerFairnessIT.java    |   3 +-
 .../accumulo/test/functional/SplitIT.java       |   3 +-
 .../apache/accumulo/test/functional/SslIT.java  |   5 +-
 .../test/functional/SslWithClientAuthIT.java    |   5 +-
 .../accumulo/test/functional/TabletIT.java      |   3 +-
 .../test/functional/WriteAheadLogIT.java        |   5 +-
 .../test/functional/ZookeeperRestartIT.java     |   3 +-
 61 files changed, 1317 insertions(+), 558 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/08f0b9ac/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/08f0b9ac/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
index b19dc7d,b2741c0..926e42e
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
@@@ -105,7 -115,6 +116,6 @@@ public class LogEntry 
    }
    
    public Value getValue() {
 -    return new Value((StringUtil.join(logSet, ";") + "|" + tabletId).getBytes());
 +    return new Value((Joiner.on(";").join(logSet) + "|" + tabletId).getBytes());
    }
-   
  }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/08f0b9ac/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/08f0b9ac/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------


Mime
View raw message