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/2dbc14fa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2dbc14fa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2dbc14fa Branch: refs/heads/master Commit: 2dbc14fa9c2da05e97e270af9dfa1b3eaf3a6a50 Parents: 866422d cb2f4b5 Author: Josh Elser <els...@apache.org> Authored: Thu Mar 20 22:12:39 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Mar 20 22:12:39 2014 -0400 ---------------------------------------------------------------------- .../core/client/admin/TableOperationsImpl.java | 4 +- .../core/client/impl/OfflineScanner.java | 4 +- .../org/apache/accumulo/core/conf/Property.java | 2 + .../accumulo/core/file/VolumeConfiguration.java | 112 ------------ .../accumulo/core/file/rfile/PrintInfo.java | 16 +- .../core/file/rfile/bcfile/PrintInfo.java | 4 +- .../apache/accumulo/core/util/shell/Shell.java | 4 +- .../core/volume/NonConfiguredVolume.java | 80 +++++++++ .../org/apache/accumulo/core/volume/Volume.java | 57 ++++++ .../core/volume/VolumeConfiguration.java | 161 +++++++++++++++++ .../apache/accumulo/core/volume/VolumeImpl.java | 107 ++++++++++++ .../apache/accumulo/core/zookeeper/ZooUtil.java | 4 +- .../core/volume/NonConfiguredVolumeTest.java | 68 ++++++++ .../org/apache/accumulo/server/Accumulo.java | 34 +++- .../apache/accumulo/server/ServerConstants.java | 50 +++--- .../accumulo/server/client/BulkImporter.java | 4 +- .../accumulo/server/client/HdfsZooInstance.java | 18 +- .../server/conf/NamespaceConfiguration.java | 24 ++- .../accumulo/server/conf/ZooConfiguration.java | 16 +- .../accumulo/server/fs/VolumeManager.java | 19 +- .../accumulo/server/fs/VolumeManagerImpl.java | 173 +++++++++++++------ .../apache/accumulo/server/fs/VolumeUtil.java | 25 ++- .../apache/accumulo/server/init/Initialize.java | 18 +- .../server/master/recovery/HadoopLogCloser.java | 2 +- .../server/master/recovery/MapRLogCloser.java | 2 +- .../accumulo/server/util/ChangeSecret.java | 25 ++- .../apache/accumulo/server/util/FileUtil.java | 12 +- .../accumulo/server/util/LocalityCheck.java | 2 +- .../accumulo/server/util/TabletOperations.java | 4 +- .../accumulo/server/util/ZooKeeperMain.java | 2 +- .../accumulo/server/ServerConstantsTest.java | 12 +- .../apache/accumulo/server/fs/FileTypeTest.java | 48 +++-- .../accumulo/server/fs/VolumeUtilTest.java | 89 +++++++++- .../accumulo/gc/GarbageCollectionTest.java | 65 +++++++ .../accumulo/master/tableOps/ExportTable.java | 2 +- .../accumulo/master/tableOps/ImportTable.java | 2 +- .../monitor/servlets/DefaultServlet.java | 6 +- .../tserver/BulkFailedCopyProcessor.java | 27 +-- .../org/apache/accumulo/tserver/Compactor.java | 4 +- .../apache/accumulo/tserver/FileManager.java | 2 +- .../org/apache/accumulo/tserver/Tablet.java | 4 +- .../apache/accumulo/tserver/TabletServer.java | 2 +- .../compaction/MajorCompactionRequest.java | 2 +- .../apache/accumulo/tserver/log/LogSorter.java | 2 +- .../accumulo/tserver/log/MultiReader.java | 2 +- .../apache/accumulo/tserver/RootFilesTest.java | 1 + .../tserver/TabletServerSyncCheckTest.java | 14 +- .../accumulo/tserver/log/MultiReaderTest.java | 8 +- .../tserver/log/SortedLogRecoveryTest.java | 9 +- .../tserver/log/TestUpgradePathForWALogs.java | 6 +- .../performance/scan/CollectTabletStats.java | 6 +- .../test/TableConfigurationUpdateIT.java | 34 +--- .../java/org/apache/accumulo/test/VolumeIT.java | 105 +++++++---- .../accumulo/test/functional/BulkFileIT.java | 4 +- 54 files changed, 1113 insertions(+), 396 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2dbc14fa/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2dbc14fa/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2dbc14fa/core/src/main/java/org/apache/accumulo/core/conf/Property.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2dbc14fa/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2dbc14fa/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2dbc14fa/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2dbc14fa/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2dbc14fa/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2dbc14fa/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java ----------------------------------------------------------------------
