You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2022/12/01 18:20:58 UTC

[accumulo] branch 2.1 updated (0928f740f9 -> b793a1f97e)

This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a change to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


    from 0928f740f9 Revert "Allow ScanServers to scan offline tables (#3082)" (#3101)
     add 48398b0573 Merge branch '2.1'
     add 78e0319e87 Remove FileSystemMonitor (#1328)
     add b546b514cc Drop old Map Reduce code (#2443)
     add 7448970bc2 Remove Connector and Instance legacy client APIs (#3073)
     add a7c0575e01 Remove legacy ClientConfiguration code (#3074)
     add f389518b6b Merge branch '2.1'
     add b7d00d068f Merge branch '2.1'
     add 10234edfb3 Merge branch '2.1'
     add f3d9903f80 Merge branch '2.1'
     add f8b7b03694 Use constants for tables instead of string literals (#3089)
     add abcf8663bc Merge branch '2.1'
     add 9bbde86a68 Remove deprecated replication (#3080)
     add 5c870af501 Merge branch '2.1'
     add b570142333 Merge branch '2.1'
     add 6328bf3b16 Merge branch '2.1'
     add 9e8964aeaa Fix flaky AuthenticationTokenSecretManagerTest (#3099)
     add b793a1f97e Merge branch 'main' into 2.1

No new revisions were added by this update.

Summary of changes:
 assemble/pom.xml                                   |    7 +-
 core/pom.xml                                       |   12 +-
 .../java/org/apache/accumulo/core/Constants.java   |    1 -
 .../accumulo/core/client/AccumuloClient.java       |   18 +-
 .../apache/accumulo/core/client/BatchWriter.java   |    2 +-
 .../accumulo/core/client/BatchWriterConfig.java    |    2 -
 .../accumulo/core/client/ClientConfiguration.java  |  547 ----
 .../org/apache/accumulo/core/client/Connector.java |  283 ---
 .../org/apache/accumulo/core/client/Instance.java  |  139 --
 .../core/client/MutationsRejectedException.java    |   25 -
 .../core/client/TableOfflineException.java         |    8 -
 .../accumulo/core/client/ZooKeeperInstance.java    |  203 --
 .../core/client/admin/ReplicationOperations.java   |   84 -
 .../core/client/mapred/AbstractInputFormat.java    |  751 ------
 .../client/mapred/AccumuloFileOutputFormat.java    |  176 --
 .../core/client/mapred/AccumuloInputFormat.java    |  107 -
 .../mapred/AccumuloMultiTableInputFormat.java      |  108 -
 .../core/client/mapred/AccumuloOutputFormat.java   |  577 -----
 .../core/client/mapred/AccumuloRowInputFormat.java |   99 -
 .../core/client/mapred/InputFormatBase.java        |  387 ---
 .../core/client/mapred/RangeInputSplit.java        |   49 -
 .../core/client/mapreduce/AbstractInputFormat.java |  781 ------
 .../client/mapreduce/AccumuloFileOutputFormat.java |  172 --
 .../core/client/mapreduce/AccumuloInputFormat.java |   92 -
 .../mapreduce/AccumuloMultiTableInputFormat.java   |  100 -
 .../client/mapreduce/AccumuloOutputFormat.java     |  581 -----
 .../client/mapreduce/AccumuloRowInputFormat.java   |   88 -
 .../core/client/mapreduce/InputFormatBase.java     |  386 ---
 .../core/client/mapreduce/InputTableConfig.java    |  394 ---
 .../core/client/mapreduce/RangeInputSplit.java     |  524 ----
 .../lib/partition/KeyRangePartitioner.java         |   67 -
 .../mapreduce/lib/partition/RangePartitioner.java  |  133 -
 .../client/replication/PeerExistsException.java    |   40 -
 .../client/replication/PeerNotFoundException.java  |   43 -
 .../core/clientImpl/ClientConfConverter.java       |  246 +-
 .../accumulo/core/clientImpl/ClientContext.java    |   64 +-
 .../accumulo/core/clientImpl/ConnectorImpl.java    |  212 --
 .../core/clientImpl/ReplicationOperationsImpl.java |  150 --
 .../core/clientImpl/mapred/BatchInputSplit.java    |   52 -
 .../core/clientImpl/mapreduce/BatchInputSplit.java |  200 --
 .../clientImpl/mapreduce/DelegationTokenStub.java  |   83 -
 .../core/clientImpl/mapreduce/SplitUtils.java      |   90 -
 .../clientImpl/mapreduce/lib/ConfiguratorBase.java |  520 ----
 .../mapreduce/lib/FileOutputConfigurator.java      |  242 --
 .../mapreduce/lib/InputConfigurator.java           |  924 -------
 .../mapreduce/lib/OutputConfigurator.java          |  203 --
 .../apache/accumulo/core/conf/ClientProperty.java  |   12 +-
 .../org/apache/accumulo/core/conf/Property.java    |  125 +-
 .../accumulo/core/data/ConditionalMutation.java    |    7 -
 .../org/apache/accumulo/core/data/Mutation.java    |   90 +-
 .../core/fate/zookeeper/ZooCacheFactory.java       |   10 +-
 .../org/apache/accumulo/core/file/rfile/RFile.java |    2 +-
 .../core/metadata/schema/MetadataSchema.java       |   55 -
 .../accumulo/core/metrics/MetricsProducer.java     |   42 -
 .../apache/accumulo/core/metrics/MetricsUtil.java  |   18 -
 .../accumulo/core/protobuf/ProtobufUtil.java       |   40 -
 .../replication/AccumuloReplicationReplayer.java   |   32 -
 .../replication/ReplicationConfigurationUtil.java  |   46 -
 .../core/replication/ReplicationConstants.java     |   29 -
 .../core/replication/ReplicationSchema.java        |  281 ---
 .../core/replication/ReplicationTable.java         |  106 -
 .../ReplicationTableOfflineException.java          |   32 -
 .../core/replication/ReplicationTarget.java        |  198 --
 .../ReplicationCoordinatorThriftClient.java        |  150 --
 .../clients/ReplicationServicerThriftClient.java   |   29 -
 .../core/rpc/clients/ThriftClientTypes.java        |    6 -
 .../accumulo/core/singletons/SingletonManager.java |   27 +-
 .../org/apache/accumulo/core/util/CleanUp.java     |   86 -
 .../org/apache/accumulo/core/util/Validators.java  |    4 +-
 .../accumulo/core/util/threads/ThreadPools.java    |   37 +-
 core/src/main/scripts/generate-thrift.sh           |    2 +-
 core/src/main/spotbugs/exclude-filter.xml          |    1 -
 .../core/manager/thrift/ManagerClientService.java  | 1421 -----------
 .../core/replication/thrift/KeyValues.java         |  461 ----
 .../thrift/RemoteReplicationErrorCode.java         |   70 -
 .../thrift/RemoteReplicationException.java         |  527 ----
 .../replication/thrift/ReplicationCoordinator.java | 1263 ----------
 .../thrift/ReplicationCoordinatorErrorCode.java    |   64 -
 .../thrift/ReplicationCoordinatorException.java    |  527 ----
 .../replication/thrift/ReplicationServicer.java    | 2638 --------------------
 .../accumulo/core/replication/thrift/WalEdits.java |  456 ----
 core/src/main/thrift/manager.thrift                |   10 -
 core/src/main/thrift/replication.thrift            |   86 -
 .../core/client/ClientConfigurationTest.java       |   98 -
 .../core/client/ZooKeeperInstanceTest.java         |  197 --
 .../mapred/AccumuloFileOutputFormatTest.java       |   95 -
 .../client/mapred/AccumuloInputFormatTest.java     |  182 --
 .../mapred/AccumuloMultiTableInputFormatTest.java  |   71 -
 .../client/mapred/AccumuloOutputFormatTest.java    |   75 -
 .../core/client/mapred/RangeInputSplitTest.java    |  115 -
 .../mapreduce/AccumuloFileOutputFormatTest.java    |   97 -
 .../client/mapreduce/AccumuloInputFormatTest.java  |  202 --
 .../AccumuloMultiTableInputFormatTest.java         |   63 -
 .../client/mapreduce/AccumuloOutputFormatTest.java |   75 -
 .../client/mapreduce/InputTableConfigTest.java     |  130 -
 .../core/client/mapreduce/RangeInputSplitTest.java |  119 -
 .../lib/partition/RangePartitionerTest.java        |   88 -
 .../core/clientImpl/ClientConfConverterTest.java   |   27 +-
 .../clientImpl/mapreduce/BatchInputSplitTest.java  |  117 -
 .../mapreduce/lib/ConfiguratorBaseTest.java        |  131 -
 .../org/apache/accumulo/core/data/TableIdTest.java |   10 +-
 .../core/metadata/MetadataServicerTest.java        |   20 -
 .../ReplicationConfigurationUtilTest.java          |   93 -
 .../core/replication/ReplicationSchemaTest.java    |  138 -
 .../core/replication/ReplicationTargetTest.java    |  101 -
 .../core/singletons/SingletonManagerTest.java      |   43 +-
 .../apache/accumulo/core/util/ValidatorsTest.java  |   18 +-
 hadoop-mapreduce/pom.xml                           |    4 +-
 .../mapreduce/partition/RangePartitioner.java      |    2 +-
 .../hadoopImpl/mapreduce/lib/ConfiguratorBase.java |    1 -
 .../mapreduce/lib/DistributedCacheHelper.java      |    2 +-
 .../hadoop/its}/mapreduce/MapReduceIT.java         |   14 +-
 iterator-test-harness/pom.xml                      |    2 +-
 minicluster/pom.xml                                |    2 +-
 .../apache/accumulo/cluster/AccumuloCluster.java   |    8 -
 .../standalone/StandaloneAccumuloCluster.java      |    7 -
 .../accumulo/minicluster/MiniAccumuloCluster.java  |   25 -
 .../accumulo/minicluster/MiniAccumuloInstance.java |   53 -
 .../miniclusterImpl/MiniAccumuloClusterImpl.java   |   18 -
 .../miniclusterImpl/MiniAccumuloConfigImpl.java    |   16 -
 .../MiniAccumuloClusterClasspathTest.java          |   55 +-
 .../MiniAccumuloClusterExistingZooKeepersTest.java |   31 +-
 .../MiniAccumuloClusterStartStopTest.java          |    9 +-
 .../minicluster/MiniAccumuloClusterTest.java       |  127 +-
 pom.xml                                            |   13 +-
 server/base/pom.xml                                |   29 +-
 .../org/apache/accumulo/server/fs/VolumeUtil.java  |   15 +-
 .../server/init/FileSystemInitializer.java         |   25 +-
 .../accumulo/server/init/InitialConfiguration.java |   74 -
 .../apache/accumulo/server/init/Initialize.java    |    3 -
 .../accumulo/server/init/ZooKeeperInitializer.java |   14 -
 .../accumulo/server/log/WalStateManager.java       |   10 +-
 .../DistributedWorkQueueWorkAssignerHelper.java    |   81 -
 .../accumulo/server/replication/ReplicaSystem.java |   50 -
 .../server/replication/ReplicaSystemFactory.java   |   98 -
 .../server/replication/ReplicaSystemHelper.java    |   64 -
 .../server/replication/ReplicationUtil.java        |  212 --
 .../server/replication/StatusCombiner.java         |  181 --
 .../server/replication/StatusFormatter.java        |  165 --
 .../accumulo/server/replication/StatusUtil.java    |  224 --
 .../accumulo/server/replication/WorkAssigner.java  |   44 -
 .../replication/ZooKeeperInitialization.java       |   44 -
 .../server/replication/proto/Replication.java      | 1154 ---------
 .../server/rpc/SaslServerConnectionParams.java     |   20 +-
 .../rpc/SaslServerDigestCallbackHandler.java       |    2 +-
 .../accumulo/server/rpc/ThriftProcessorTypes.java  |   26 -
 .../server/security/SecurityOperation.java         |    7 +-
 .../apache/accumulo/server/tablets/TabletTime.java |    1 -
 .../accumulo/server/util/FileSystemMonitor.java    |  158 --
 .../accumulo/server/util/ReplicationTableUtil.java |  195 --
 server/base/src/main/protobuf/replication.proto    |   29 -
 server/base/src/main/scripts/generate-protobuf.sh  |  104 -
 .../apache/accumulo/server/ServerContextTest.java  |    5 +-
 .../constraints/MetadataConstraintsTest.java       |    3 +-
 .../server/replication/ReplicationUtilTest.java    |  115 -
 .../server/replication/StatusCombinerTest.java     |  295 ---
 .../server/replication/StatusUtilTest.java         |   64 -
 .../server/replication/proto/StatusTest.java       |   39 -
 .../server/rpc/SaslServerConnectionParamsTest.java |    2 +-
 .../accumulo/server/rpc/TServerUtilsTest.java      |   12 +-
 .../server/security/SystemCredentialsTest.java     |   16 -
 .../AuthenticationTokenSecretManagerTest.java      |    2 +
 .../server/util/FileSystemMonitorTest.java         |  101 -
 .../server/util/ReplicationTableUtilTest.java      |  164 --
 server/compaction-coordinator/pom.xml              |    2 +-
 server/compactor/pom.xml                           |    2 +-
 server/gc/pom.xml                                  |    6 +-
 .../main/java/org/apache/accumulo/gc/GCRun.java    |   30 -
 .../accumulo/gc/GarbageCollectWriteAheadLogs.java  |   56 -
 .../accumulo/gc/GarbageCollectionAlgorithm.java    |   43 -
 .../accumulo/gc/GarbageCollectionEnvironment.java  |    8 -
 .../apache/accumulo/gc/SimpleGarbageCollector.java |   18 -
 .../replication/CloseWriteAheadLogReferences.java  |  206 --
 .../gc/GarbageCollectWriteAheadLogsTest.java       |  115 +-
 .../apache/accumulo/gc/GarbageCollectionTest.java  |   91 +-
 server/manager/pom.xml                             |    6 +-
 .../java/org/apache/accumulo/manager/Manager.java  |   79 +-
 .../manager/ManagerClientServiceHandler.java       |  113 -
 .../accumulo/manager/metrics/ManagerMetrics.java   |    4 -
 .../manager/metrics/ReplicationMetrics.java        |  174 --
 .../DistributedWorkQueueWorkAssigner.java          |  267 --
 .../manager/replication/FinishedWorkUpdater.java   |  190 --
 .../replication/ManagerReplicationCoordinator.java |  110 -
 .../RemoveCompleteReplicationRecords.java          |  225 --
 .../manager/replication/ReplicationDriver.java     |  130 -
 .../replication/SequentialWorkAssigner.java        |  229 --
 .../accumulo/manager/replication/StatusMaker.java  |  304 ---
 .../manager/replication/UnorderedWorkAssigner.java |  185 --
 .../accumulo/manager/replication/WorkDriver.java   |   98 -
 .../accumulo/manager/replication/WorkMaker.java    |  225 --
 .../manager/tableOps/bulkVer1/BulkImport.java      |    3 +-
 .../master/replication/UnorderedWorkAssigner.java  |   43 -
 .../manager/metrics/ReplicationMetricsTest.java    |  112 -
 ...DistributedWorkQueueWorkAssignerHelperTest.java |   59 -
 .../ManagerReplicationCoordinatorTest.java         |  112 -
 .../replication/SequentialWorkAssignerTest.java    |  109 -
 .../replication/UnorderedWorkAssignerTest.java     |  138 -
 .../manager/replication/WorkMakerTest.java         |   41 -
 server/master/pom.xml                              |    2 +-
 server/monitor/pom.xml                             |    2 +-
 .../rest/replication/ReplicationInformation.java   |   56 -
 .../rest/replication/ReplicationResource.java      |  221 --
 .../org/apache/accumulo/monitor/view/WebViews.java |   19 -
 .../accumulo/monitor/resources/js/functions.js     |    8 -
 .../accumulo/monitor/resources/js/replication.js   |   79 -
 .../apache/accumulo/monitor/templates/navbar.ftl   |    3 +-
 .../accumulo/monitor/templates/replication.ftl     |   42 -
 server/native/pom.xml                              |    2 +-
 server/tserver/pom.xml                             |    6 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |   98 -
 .../accumulo/tserver/log/TabletServerLogger.java   |  154 +-
 .../tserver/replication/AccumuloReplicaSystem.java |  754 ------
 .../BatchWriterReplicationReplayer.java            |  174 --
 .../tserver/replication/ReplicationProcessor.java  |  182 --
 .../replication/ReplicationServicerHandler.java    |  125 -
 .../tserver/replication/ReplicationStats.java      |   64 -
 .../tserver/replication/ReplicationWorker.java     |   78 -
 .../tserver/replication/WalClientExecReturn.java   |   98 -
 .../tserver/replication/WalReplication.java        |   63 -
 .../accumulo/tserver/tablet/DatafileManager.java   |   39 -
 .../org/apache/accumulo/tserver/tablet/Tablet.java |   22 +-
 .../replication/AccumuloReplicaSystemTest.java     |  545 ----
 .../BatchWriterReplicationReplayerTest.java        |  204 --
 .../replication/ReplicationProcessorTest.java      |  102 -
 .../src/test/resources/log4j2-test.properties      |    9 +-
 shell/pom.xml                                      |    2 +-
 .../main/java/org/apache/accumulo/shell/Shell.java |    4 +-
 .../accumulo/shell/commands/ScriptCommand.java     |  317 ---
 start/pom.xml                                      |    2 +-
 test/pom.xml                                       |    6 +-
 .../test/ManagerRepairsDualAssignmentIT.java       |    8 -
 .../org/apache/accumulo/test/NamespacesIT.java     |    2 +-
 .../accumulo/test/ScanServerMetadataEntriesIT.java |    3 +-
 .../apache/accumulo/test/TableOperationsIT.java    |    9 +-
 .../accumulo/test/VerifySerialRecoveryIT.java      |    5 +-
 .../org/apache/accumulo/test/WaitForBalanceIT.java |    3 +-
 .../test/compaction/CompactionExecutorIT.java      |    5 +-
 .../test/compaction/ExternalCompaction_1_IT.java   |    3 +-
 .../accumulo/test/functional/AccumuloClientIT.java |   36 -
 .../apache/accumulo/test/functional/CleanUpIT.java |  172 --
 .../org/apache/accumulo/test/functional/SslIT.java |   12 -
 .../test/functional/SslWithClientAuthIT.java       |    6 -
 .../functional/TabletStateChangeIteratorIT.java    |    4 +-
 .../CloseWriteAheadLogReferencesIT.java            |  189 --
 .../test/mapred/AccumuloFileOutputFormatIT.java    |  234 --
 .../test/mapred/AccumuloInputFormatIT.java         |  265 --
 .../mapred/AccumuloMultiTableInputFormatIT.java    |  176 --
 .../test/mapred/AccumuloOutputFormatIT.java        |  243 --
 .../test/mapred/AccumuloRowInputFormatIT.java      |  208 --
 .../apache/accumulo/test/mapred/TokenFileIT.java   |  208 --
 .../test/mapreduce/AccumuloFileOutputFormatIT.java |  249 --
 .../test/mapreduce/AccumuloInputFormatIT.java      |  556 -----
 .../mapreduce/AccumuloMultiTableInputFormatIT.java |  178 --
 .../test/mapreduce/AccumuloOutputFormatIT.java     |  172 --
 .../test/mapreduce/AccumuloRowInputFormatIT.java   |  205 --
 .../apache/accumulo/test/mapreduce/RowHash.java    |  128 -
 .../accumulo/test/mapreduce/TokenFileIT.java       |  212 --
 .../apache/accumulo/test/metrics/MetricsIT.java    |    2 +-
 .../test/replication/CyclicReplicationIT.java      |  378 ---
 .../test/replication/FinishedWorkUpdaterIT.java    |  193 --
 ...GarbageCollectorCommunicatesWithTServersIT.java |  431 ----
 .../test/replication/KerberosReplicationIT.java    |  275 --
 .../test/replication/MockReplicaSystem.java        |  103 -
 .../replication/MultiInstanceReplicationIT.java    |  814 ------
 .../replication/MultiTserverReplicationIT.java     |  131 -
 .../RemoveCompleteReplicationRecordsIT.java        |  364 ---
 .../accumulo/test/replication/ReplicationIT.java   | 1514 -----------
 .../replication/ReplicationOperationsImplIT.java   |  455 ----
 .../test/replication/SequentialWorkAssignerIT.java |  401 ---
 .../test/replication/StatusCombinerMacIT.java      |  144 --
 .../accumulo/test/replication/StatusMakerIT.java   |  378 ---
 .../test/replication/UnorderedWorkAssignerIT.java  |  256 --
 .../UnorderedWorkAssignerReplicationIT.java        |  810 ------
 .../UnusedWalDoesntCloseReplicationStatusIT.java   |  244 --
 .../accumulo/test/replication/WorkMakerIT.java     |  236 --
 test/src/main/resources/log4j2-test.properties     |   17 +-
 276 files changed, 443 insertions(+), 42712 deletions(-)
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/Connector.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/Instance.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/admin/ReplicationOperations.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapred/RangeInputSplit.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/replication/PeerExistsException.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/client/replication/PeerNotFoundException.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/clientImpl/ConnectorImpl.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/clientImpl/ReplicationOperationsImpl.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/clientImpl/mapred/BatchInputSplit.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/BatchInputSplit.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/DelegationTokenStub.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/SplitUtils.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBase.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/FileOutputConfigurator.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/InputConfigurator.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/OutputConfigurator.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/protobuf/ProtobufUtil.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/replication/AccumuloReplicationReplayer.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtil.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/replication/ReplicationConstants.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/replication/ReplicationTable.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/replication/ReplicationTableOfflineException.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/replication/ReplicationTarget.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/rpc/clients/ReplicationCoordinatorThriftClient.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/rpc/clients/ReplicationServicerThriftClient.java
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/util/CleanUp.java
 delete mode 100644 core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/KeyValues.java
 delete mode 100644 core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
 delete mode 100644 core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
 delete mode 100644 core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
 delete mode 100644 core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
 delete mode 100644 core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
 delete mode 100644 core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
 delete mode 100644 core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/WalEdits.java
 delete mode 100644 core/src/main/thrift/replication.thrift
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/ClientConfigurationTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormatTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormatTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormatTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormatTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/clientImpl/mapreduce/BatchInputSplitTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBaseTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/replication/ReplicationSchemaTest.java
 delete mode 100644 core/src/test/java/org/apache/accumulo/core/replication/ReplicationTargetTest.java
 rename {core/src/main/java/org/apache/accumulo/core/clientImpl => hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl}/mapreduce/lib/DistributedCacheHelper.java (98%)
 rename {test/src/main/java/org/apache/accumulo/test => hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its}/mapreduce/MapReduceIT.java (88%)
 delete mode 100644 minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/replication/DistributedWorkQueueWorkAssignerHelper.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystem.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemFactory.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/replication/StatusFormatter.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/replication/StatusUtil.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/replication/WorkAssigner.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/replication/ZooKeeperInitialization.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/replication/proto/Replication.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
 delete mode 100644 server/base/src/main/protobuf/replication.proto
 delete mode 100755 server/base/src/main/scripts/generate-protobuf.sh
 delete mode 100644 server/base/src/test/java/org/apache/accumulo/server/replication/ReplicationUtilTest.java
 delete mode 100644 server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
 delete mode 100644 server/base/src/test/java/org/apache/accumulo/server/replication/StatusUtilTest.java
 delete mode 100644 server/base/src/test/java/org/apache/accumulo/server/replication/proto/StatusTest.java
 delete mode 100644 server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
 delete mode 100644 server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
 delete mode 100644 server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
 delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/metrics/ReplicationMetrics.java
 delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/replication/DistributedWorkQueueWorkAssigner.java
 delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/replication/FinishedWorkUpdater.java
 delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/replication/ManagerReplicationCoordinator.java
 delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/replication/RemoveCompleteReplicationRecords.java
 delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/replication/ReplicationDriver.java
 delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/replication/SequentialWorkAssigner.java
 delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/replication/StatusMaker.java
 delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/replication/UnorderedWorkAssigner.java
 delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/replication/WorkDriver.java
 delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/replication/WorkMaker.java
 delete mode 100644 server/manager/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java
 delete mode 100644 server/manager/src/test/java/org/apache/accumulo/manager/metrics/ReplicationMetricsTest.java
 delete mode 100644 server/manager/src/test/java/org/apache/accumulo/manager/replication/DistributedWorkQueueWorkAssignerHelperTest.java
 delete mode 100644 server/manager/src/test/java/org/apache/accumulo/manager/replication/ManagerReplicationCoordinatorTest.java
 delete mode 100644 server/manager/src/test/java/org/apache/accumulo/manager/replication/SequentialWorkAssignerTest.java
 delete mode 100644 server/manager/src/test/java/org/apache/accumulo/manager/replication/UnorderedWorkAssignerTest.java
 delete mode 100644 server/manager/src/test/java/org/apache/accumulo/manager/replication/WorkMakerTest.java
 delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationInformation.java
 delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
 delete mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/replication.js
 delete mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/replication.ftl
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationStats.java
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationWorker.java
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/replication/WalClientExecReturn.java
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/replication/WalReplication.java
 delete mode 100644 server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
 delete mode 100644 server/tserver/src/test/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayerTest.java
 delete mode 100644 server/tserver/src/test/java/org/apache/accumulo/tserver/replication/ReplicationProcessorTest.java
 delete mode 100644 shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/functional/CleanUpIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapreduce/RowHash.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/MockReplicaSystem.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java