You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2018/09/22 01:40:13 UTC
[15/18] hadoop git commit: Merge commit
'eca1a4bfe952fc184fe90dde50bac9b0e5293568' into HDFS-12943
Merge commit 'eca1a4bfe952fc184fe90dde50bac9b0e5293568' into HDFS-12943
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6c37db9d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6c37db9d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6c37db9d
Branch: refs/heads/HDFS-12943
Commit: 6c37db9da36a4fe716f616977b1d382ffa8a027a
Parents: 4b0ff03 eca1a4b
Author: Konstantin V Shvachko <sh...@apache.org>
Authored: Fri Sep 21 18:22:48 2018 -0700
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Fri Sep 21 18:22:48 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hdfs/DFSClient.java | 4 +--
.../org/apache/hadoop/hdfs/DFSUtilClient.java | 2 +-
.../java/org/apache/hadoop/hdfs/PeerCache.java | 8 ++---
.../hdfs/client/impl/BlockReaderFactory.java | 12 +++----
.../client/impl/BlockReaderLocalLegacy.java | 2 +-
.../hdfs/shortcircuit/ShortCircuitCache.java | 4 +--
.../hdfs/shortcircuit/ShortCircuitReplica.java | 2 +-
.../apache/hadoop/hdfs/util/IOUtilsClient.java | 3 +-
.../hadoop/hdfs/nfs/nfs3/OpenFileCtx.java | 4 +--
.../hadoop/hdfs/nfs/nfs3/OpenFileCtxCache.java | 6 ++--
.../java/org/apache/hadoop/hdfs/DFSUtil.java | 7 +++--
.../org/apache/hadoop/hdfs/HdfsDtFetcher.java | 7 +++--
.../org/apache/hadoop/hdfs/NameNodeProxies.java | 7 +++--
.../apache/hadoop/hdfs/SWebHdfsDtFetcher.java | 7 +++--
.../apache/hadoop/hdfs/WebHdfsDtFetcher.java | 7 +++--
.../hadoop/hdfs/net/DomainPeerServer.java | 6 ++--
.../apache/hadoop/hdfs/net/TcpPeerServer.java | 6 ++--
.../hdfs/qjournal/client/AsyncLoggerSet.java | 8 ++---
.../qjournal/client/QuorumJournalManager.java | 6 ++--
.../qjournal/server/GetJournalEditServlet.java | 7 +++--
.../hadoop/hdfs/qjournal/server/Journal.java | 12 +++----
.../hdfs/qjournal/server/JournalNode.java | 10 +++---
.../qjournal/server/JournalNodeRpcServer.java | 4 +--
.../token/block/BlockTokenSecretManager.java | 7 +++--
.../DelegationTokenSecretManager.java | 8 ++---
.../hadoop/hdfs/server/balancer/Balancer.java | 8 ++---
.../hadoop/hdfs/server/balancer/Dispatcher.java | 6 ++--
.../hdfs/server/balancer/NameNodeConnector.java | 7 +++--
.../AvailableSpaceBlockPlacementPolicy.java | 8 ++---
.../server/blockmanagement/DatanodeManager.java | 6 ++--
.../server/blockmanagement/HostFileManager.java | 7 +++--
.../hadoop/hdfs/server/common/JspHelper.java | 6 ++--
.../hdfs/server/common/MetricsLoggerTask.java | 6 ++--
.../apache/hadoop/hdfs/server/common/Util.java | 7 +++--
.../hdfs/server/datanode/DirectoryScanner.java | 7 +++--
.../server/datanode/ProfilingFileIoEvents.java | 7 +++--
.../server/datanode/ShortCircuitRegistry.java | 7 +++--
.../AvailableSpaceVolumeChoosingPolicy.java | 7 +++--
.../RoundRobinVolumeChoosingPolicy.java | 7 +++--
.../datanode/fsdataset/impl/BlockPoolSlice.java | 8 ++---
.../impl/FsDatasetAsyncDiskService.java | 7 +++--
.../impl/RamDiskAsyncLazyPersistService.java | 7 +++--
.../fsdataset/impl/RamDiskReplicaTracker.java | 7 +++--
.../server/datanode/web/DatanodeHttpServer.java | 6 ++--
.../web/RestCsrfPreventionFilterHandler.java | 4 +--
.../datanode/web/SimpleHttpProxyHandler.java | 4 +--
.../web/webhdfs/DataNodeUGIProvider.java | 6 ++--
.../datanode/web/webhdfs/ExceptionHandler.java | 4 +--
.../server/datanode/web/webhdfs/HdfsWriter.java | 8 ++---
.../datanode/web/webhdfs/WebHdfsHandler.java | 10 +++---
.../apache/hadoop/hdfs/server/mover/Mover.java | 12 +++----
.../hadoop/hdfs/server/namenode/CachePool.java | 2 --
.../hdfs/server/namenode/CheckpointConf.java | 7 +++--
.../hdfs/server/namenode/Checkpointer.java | 8 ++---
.../ContentSummaryComputationContext.java | 8 ++---
.../hadoop/hdfs/server/namenode/DfsServlet.java | 7 +++--
.../namenode/EditLogBackupOutputStream.java | 7 +++--
.../server/namenode/EditLogFileInputStream.java | 8 ++---
.../namenode/EditLogFileOutputStream.java | 11 ++++---
.../hdfs/server/namenode/EditsDoubleBuffer.java | 7 +++--
.../hdfs/server/namenode/FSEditLogAsync.java | 8 ++---
.../hdfs/server/namenode/FSEditLogLoader.java | 7 +++--
.../hadoop/hdfs/server/namenode/FSImage.java | 9 +++---
.../hdfs/server/namenode/FSImageFormat.java | 6 ++--
.../server/namenode/FSImageFormatPBINode.java | 7 +++--
...FSImagePreTransactionalStorageInspector.java | 10 +++---
.../FSImageTransactionalStorageInspector.java | 6 ++--
.../hdfs/server/namenode/FSNamesystem.java | 2 +-
.../server/namenode/FSPermissionChecker.java | 6 ++--
.../server/namenode/FileJournalManager.java | 7 +++--
.../hadoop/hdfs/server/namenode/INode.java | 6 ++--
.../hdfs/server/namenode/INodesInPath.java | 6 ++--
.../hdfs/server/namenode/ImageServlet.java | 6 ++--
.../hadoop/hdfs/server/namenode/JournalSet.java | 8 ++---
.../server/namenode/MetaRecoveryContext.java | 7 +++--
.../namenode/NNStorageRetentionManager.java | 6 ++--
.../hdfs/server/namenode/NNUpgradeUtil.java | 7 +++--
.../hadoop/hdfs/server/namenode/NameCache.java | 6 ++--
.../namenode/NameNodeResourceChecker.java | 7 +++--
.../hdfs/server/namenode/NamenodeFsck.java | 9 +++---
.../namenode/RedundantEditLogInputStream.java | 8 ++---
.../hdfs/server/namenode/SecondaryNameNode.java | 16 +++++-----
.../server/namenode/StartupProgressServlet.java | 2 +-
.../hdfs/server/namenode/TransferFsImage.java | 7 +++--
.../server/namenode/ha/BootstrapStandby.java | 13 ++++----
.../hdfs/server/namenode/ha/EditLogTailer.java | 8 ++---
.../web/resources/NamenodeWebHdfsMethods.java | 7 +++--
.../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 6 ++--
.../apache/hadoop/hdfs/tools/DFSHAAdmin.java | 6 ++--
.../hdfs/tools/DFSZKFailoverController.java | 12 +++----
.../hdfs/tools/DelegationTokenFetcher.java | 8 ++---
.../org/apache/hadoop/hdfs/tools/GetGroups.java | 6 ++--
.../OfflineEditsBinaryLoader.java | 10 +++---
.../offlineImageViewer/FSImageHandler.java | 7 +++--
.../tools/offlineImageViewer/FSImageLoader.java | 7 +++--
.../OfflineImageReconstructor.java | 10 +++---
.../offlineImageViewer/OfflineImageViewer.java | 9 +++---
.../OfflineImageViewerPB.java | 7 +++--
.../offlineImageViewer/WebImageViewer.java | 7 +++--
.../hdfs/util/AtomicFileOutputStream.java | 6 ++--
.../hadoop/hdfs/util/LightWeightHashSet.java | 7 +++--
.../apache/hadoop/hdfs/util/MD5FileUtils.java | 8 ++---
.../hadoop/hdfs/util/PersistentLongFile.java | 8 ++---
.../hdfs/web/resources/ExceptionHandler.java | 7 +++--
.../apache/hadoop/cli/TestCacheAdminCLI.java | 7 +++--
.../hadoop/fs/TestEnhancedByteBufferAccess.java | 10 +++---
.../hadoop/fs/TestHdfsNativeCodeLoader.java | 7 +++--
.../java/org/apache/hadoop/fs/TestUnbuffer.java | 8 ++---
.../apache/hadoop/hdfs/AdminStatesBaseTest.java | 7 +++--
.../org/apache/hadoop/hdfs/AppendTestUtil.java | 6 ++--
.../apache/hadoop/hdfs/BenchmarkThroughput.java | 13 +++-----
.../org/apache/hadoop/hdfs/DFSTestUtil.java | 6 ++--
.../org/apache/hadoop/hdfs/FileAppendTest4.java | 7 +++--
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 9 +++---
.../hdfs/MiniDFSClusterWithNodeGroup.java | 7 +++--
.../hdfs/ReadStripedFileWithDecodingHelper.java | 5 +--
.../apache/hadoop/hdfs/TestAbandonBlock.java | 7 +++--
.../apache/hadoop/hdfs/TestAclsEndToEnd.java | 8 ++---
.../hadoop/hdfs/TestAppendSnapshotTruncate.java | 7 +++--
.../hadoop/hdfs/TestBalancerBandwidth.java | 7 +++--
.../hadoop/hdfs/TestBlockMissingException.java | 7 +++--
.../hadoop/hdfs/TestClientReportBadBlock.java | 8 ++---
.../org/apache/hadoop/hdfs/TestConnCache.java | 6 ++--
.../hadoop/hdfs/TestDFSClientFailover.java | 2 --
.../hadoop/hdfs/TestDFSClientRetries.java | 10 +++---
.../org/apache/hadoop/hdfs/TestDFSFinalize.java | 6 ++--
.../hdfs/TestDFSInotifyEventInputStream.java | 6 ++--
.../apache/hadoop/hdfs/TestDFSPermission.java | 7 +++--
.../org/apache/hadoop/hdfs/TestDFSRollback.java | 6 ++--
.../org/apache/hadoop/hdfs/TestDFSShell.java | 6 ++--
.../hadoop/hdfs/TestDFSStartupVersions.java | 6 ++--
.../hdfs/TestDFSStorageStateRecovery.java | 6 ++--
.../hadoop/hdfs/TestDFSStripedInputStream.java | 8 ++---
...DFSStripedInputStreamWithRandomECPolicy.java | 8 ++---
.../hadoop/hdfs/TestDFSStripedOutputStream.java | 6 ++--
...tputStreamWithFailureWithRandomECPolicy.java | 8 ++---
...FSStripedOutputStreamWithRandomECPolicy.java | 8 ++---
.../org/apache/hadoop/hdfs/TestDFSUpgrade.java | 7 +++--
.../hadoop/hdfs/TestDFSUpgradeFromImage.java | 7 ++---
.../org/apache/hadoop/hdfs/TestDataStream.java | 6 ++--
.../hadoop/hdfs/TestDataTransferProtocol.java | 6 ++--
.../hadoop/hdfs/TestDatanodeRegistration.java | 7 +++--
.../apache/hadoop/hdfs/TestDatanodeReport.java | 6 ++--
.../hadoop/hdfs/TestDisableConnCache.java | 6 ++--
.../hadoop/hdfs/TestEncryptedTransfer.java | 17 +++++-----
.../hadoop/hdfs/TestExternalBlockReader.java | 8 ++---
.../apache/hadoop/hdfs/TestHDFSServerPorts.java | 7 +++--
.../org/apache/hadoop/hdfs/TestHDFSTrash.java | 6 ++--
.../hdfs/TestInjectionForSimulatedStorage.java | 6 ++--
.../org/apache/hadoop/hdfs/TestLargeBlock.java | 7 +++--
.../java/org/apache/hadoop/hdfs/TestLease.java | 6 ++--
.../apache/hadoop/hdfs/TestLeaseRecovery2.java | 7 +++--
.../hadoop/hdfs/TestMissingBlocksAlert.java | 8 ++---
.../hadoop/hdfs/TestParallelReadUtil.java | 6 ++--
.../org/apache/hadoop/hdfs/TestPipelines.java | 6 ++--
.../TestReadStripedFileWithMissingBlocks.java | 8 ++---
.../hadoop/hdfs/TestReconstructStripedFile.java | 7 +++--
.../TestReplaceDatanodeFailureReplication.java | 8 ++---
.../hdfs/TestReplaceDatanodeOnFailure.java | 7 +++--
.../org/apache/hadoop/hdfs/TestReplication.java | 2 --
.../apache/hadoop/hdfs/TestRollingUpgrade.java | 7 +++--
.../org/apache/hadoop/hdfs/TestSafeMode.java | 6 ++--
.../TestUnsetAndChangeDirectoryEcPolicy.java | 8 ++---
.../org/apache/hadoop/hdfs/TestWriteRead.java | 8 ++---
.../hadoop/hdfs/TestWriteReadStripedFile.java | 19 ++++++-----
.../hdfs/TestWriteStripedFileWithFailure.java | 8 ++---
.../hadoop/hdfs/net/TestDFSNetworkTopology.java | 8 ++---
.../hadoop/hdfs/protocol/TestLocatedBlock.java | 9 +++---
.../datatransfer/sasl/TestSaslDataTransfer.java | 4 +--
.../hdfs/qjournal/MiniJournalCluster.java | 7 +++--
.../hadoop/hdfs/qjournal/MiniQJMHACluster.java | 7 +++--
.../hdfs/qjournal/TestSecureNNWithQJM.java | 2 --
.../qjournal/client/TestEpochsAreUnique.java | 7 +++--
.../hdfs/qjournal/client/TestQJMWithFaults.java | 6 ++--
.../client/TestQuorumJournalManager.java | 16 +++++-----
.../client/TestQuorumJournalManagerUnit.java | 4 +--
.../TestJournalNodeRespectsBindHostKeys.java | 6 ++--
.../hdfs/security/TestDelegationToken.java | 11 ++++---
.../TestDelegationTokenForProxyUser.java | 7 +++--
.../security/token/block/TestBlockToken.java | 7 +++--
.../hdfs/server/balancer/TestBalancer.java | 12 +++----
.../TestBalancerWithMultipleNameNodes.java | 12 +++----
.../balancer/TestBalancerWithNodeGroup.java | 6 ++--
.../BaseReplicationPolicyTest.java | 3 +-
.../server/blockmanagement/TestBlockInfo.java | 8 ++---
.../blockmanagement/TestBlockManager.java | 12 +++----
.../TestBlockReportRateLimiting.java | 7 +++--
.../TestBlocksWithNotEnoughRacks.java | 7 +++--
.../blockmanagement/TestCachedBlocksList.java | 7 +++--
.../blockmanagement/TestCorruptReplicaInfo.java | 6 ++--
.../blockmanagement/TestDatanodeManager.java | 7 +++--
.../TestNameNodePrunesMissingStorages.java | 7 +++--
.../TestRBWBlockInvalidation.java | 9 +++---
.../TestSequentialBlockGroupId.java | 8 ++---
.../blockmanagement/TestSequentialBlockId.java | 7 +++--
.../server/common/TestGetUriFromString.java | 7 +++--
.../hdfs/server/datanode/DataNodeTestUtils.java | 8 ++---
.../server/datanode/TestBPOfferService.java | 6 ++--
.../hdfs/server/datanode/TestBatchIbr.java | 11 ++++---
.../TestBlockHasMultipleReplicasOnSameDN.java | 7 +++--
.../server/datanode/TestBlockPoolManager.java | 7 +++--
.../hdfs/server/datanode/TestBlockRecovery.java | 13 ++++----
.../server/datanode/TestBlockReplacement.java | 6 ++--
.../datanode/TestBpServiceActorScheduler.java | 7 +++--
.../TestDataNodeErasureCodingMetrics.java | 8 ++---
.../datanode/TestDataNodeFaultInjector.java | 8 ++---
.../datanode/TestDataNodeHotSwapVolumes.java | 8 ++---
.../datanode/TestDataNodeInitStorage.java | 7 +++--
.../server/datanode/TestDataNodeMXBean.java | 7 +++--
.../server/datanode/TestDataNodeMetrics.java | 9 +++---
.../datanode/TestDataNodeMetricsLogger.java | 6 ++--
.../TestDataNodeMultipleRegistrations.java | 8 ++---
.../datanode/TestDataNodeReconfiguration.java | 7 +++--
.../datanode/TestDataNodeRollingUpgrade.java | 7 +++--
.../server/datanode/TestDataNodeTcpNoDelay.java | 8 ++---
.../TestDataNodeVolumeFailureReporting.java | 14 ++++-----
.../datanode/TestDataNodeVolumeMetrics.java | 8 ++---
.../TestDatanodeProtocolRetryPolicy.java | 10 +++---
.../server/datanode/TestDatanodeRegister.java | 7 +++--
.../server/datanode/TestDirectoryScanner.java | 9 +++---
...TestDnRespectsBlockReportSplitThreshold.java | 7 +++--
.../server/datanode/TestFsDatasetCache.java | 14 ++++-----
.../datanode/TestIncrementalBlockReports.java | 7 +++--
.../datanode/TestIncrementalBrVariations.java | 21 +++++++------
.../datanode/TestReadOnlySharedStorage.java | 7 +++--
.../hdfs/server/datanode/TestStorageReport.java | 7 +++--
.../hdfs/server/datanode/TestTransferRbw.java | 7 +++--
.../fsdataset/impl/FsDatasetImplTestUtils.java | 8 ++---
.../fsdataset/impl/LazyPersistTestCase.java | 7 +++--
.../fsdataset/impl/TestSpaceReservation.java | 6 ++--
.../TestDiskBalancerWithMockMover.java | 7 +++--
.../hdfs/server/mover/TestStorageMover.java | 22 ++++++-------
.../hdfs/server/namenode/FSImageTestUtil.java | 28 +++++------------
.../server/namenode/NNThroughputBenchmark.java | 9 +++---
.../namenode/OfflineEditsViewerHelper.java | 8 ++---
.../hdfs/server/namenode/TestAddBlockRetry.java | 7 +++--
.../hdfs/server/namenode/TestAllowFormat.java | 8 ++---
.../server/namenode/TestAuditLogAtDebug.java | 6 ++--
.../hdfs/server/namenode/TestBackupNode.java | 13 ++++----
.../server/namenode/TestCacheDirectives.java | 6 ++--
.../hdfs/server/namenode/TestCheckpoint.java | 8 ++---
.../hdfs/server/namenode/TestClusterId.java | 9 +++---
.../hdfs/server/namenode/TestDeadDatanode.java | 7 +++--
.../hdfs/server/namenode/TestEditLog.java | 10 +++---
.../namenode/TestEditLogFileInputStream.java | 8 ++---
.../hdfs/server/namenode/TestEditLogRace.java | 11 ++++---
.../hdfs/server/namenode/TestFSDirAttrOp.java | 7 +++--
.../hdfs/server/namenode/TestFSDirectory.java | 7 +++--
.../server/namenode/TestFSEditLogLoader.java | 6 ++--
.../namenode/TestFSImageWithSnapshot.java | 4 +--
.../namenode/TestFavoredNodesEndToEnd.java | 8 ++---
.../server/namenode/TestFileJournalManager.java | 23 ++++++++------
.../hdfs/server/namenode/TestFileTruncate.java | 12 +++----
.../hadoop/hdfs/server/namenode/TestFsck.java | 13 ++++----
.../namenode/TestFsckWithMultipleNameNodes.java | 7 +++--
.../hdfs/server/namenode/TestHDFSConcat.java | 7 +++--
.../hdfs/server/namenode/TestHostsFiles.java | 8 ++---
.../hdfs/server/namenode/TestINodeFile.java | 8 ++---
.../namenode/TestLargeDirectoryDelete.java | 9 +++---
.../hdfs/server/namenode/TestListOpenFiles.java | 9 +++---
.../TestNNStorageRetentionFunctional.java | 6 ++--
.../server/namenode/TestNameEditsConfigs.java | 6 ++--
.../namenode/TestNameNodeMetricsLogger.java | 6 ++--
.../namenode/TestNameNodeReconfigure.java | 8 ++---
.../server/namenode/TestNameNodeRecovery.java | 9 +++---
.../TestNameNodeRespectsBindHostKeys.java | 7 +++--
.../namenode/TestNameNodeStatusMXBean.java | 6 ++--
.../namenode/TestNamenodeCapacityReport.java | 7 +++--
.../server/namenode/TestQuotaByStorageType.java | 33 ++++++++++----------
.../hdfs/server/namenode/TestSaveNamespace.java | 4 +--
.../hdfs/server/namenode/TestStartup.java | 7 ++---
.../server/namenode/TestStorageRestore.java | 8 ++---
.../server/namenode/TestStripedINodeFile.java | 6 ++--
.../hdfs/server/namenode/ha/HATestUtil.java | 6 ++--
.../namenode/ha/TestBootstrapStandby.java | 13 ++++----
.../namenode/ha/TestDFSUpgradeWithHA.java | 7 +++--
.../namenode/ha/TestDelegationTokensWithHA.java | 8 ++---
.../server/namenode/ha/TestEditLogTailer.java | 4 +--
.../namenode/ha/TestEditLogsDuringFailover.java | 10 +++---
.../namenode/ha/TestFailureToReadEdits.java | 8 ++---
.../hdfs/server/namenode/ha/TestHAFsck.java | 4 +--
.../hdfs/server/namenode/ha/TestHAMetrics.java | 11 ++++---
.../hdfs/server/namenode/ha/TestHASafeMode.java | 13 ++++----
.../namenode/ha/TestHAStateTransitions.java | 12 +++----
.../namenode/ha/TestInitializeSharedEdits.java | 7 +++--
.../namenode/ha/TestRetryCacheWithHA.java | 7 +++--
.../namenode/ha/TestSeveralNameNodes.java | 7 +++--
.../namenode/ha/TestStandbyBlockManagement.java | 6 ++--
.../namenode/ha/TestStandbyInProgressTail.java | 8 ++---
.../server/namenode/ha/TestStandbyIsHot.java | 6 ++--
.../namenode/metrics/TestNameNodeMetrics.java | 11 ++++---
...tINodeFileUnderConstructionWithSnapshot.java | 6 ++--
.../snapshot/TestOpenFilesWithSnapshot.java | 8 ++---
.../snapshot/TestRenameWithSnapshots.java | 7 +++--
.../server/namenode/snapshot/TestSnapshot.java | 4 +--
.../resources/TestWebHdfsCreatePermissions.java | 7 +++--
.../web/resources/TestWebHdfsDataLocality.java | 7 +++--
.../sps/TestExternalStoragePolicySatisfier.java | 3 +-
.../shortcircuit/TestShortCircuitCache.java | 9 +++---
.../apache/hadoop/hdfs/tools/TestDFSAdmin.java | 6 ++--
.../hadoop/hdfs/tools/TestDFSHAAdmin.java | 7 +++--
.../hdfs/tools/TestDFSHAAdminMiniCluster.java | 13 ++++----
.../TestOfflineEditsViewer.java | 8 ++---
.../TestOfflineImageViewer.java | 9 +++---
.../TestOfflineImageViewerForAcl.java | 8 ++---
...TestOfflineImageViewerForContentSummary.java | 8 ++---
.../TestOfflineImageViewerForXAttr.java | 8 ++---
.../hdfs/util/TestLightWeightHashSet.java | 8 ++---
.../hdfs/util/TestLightWeightLinkedSet.java | 10 +++---
.../hdfs/web/TestFSMainOperationsWebHdfs.java | 4 +--
.../org/apache/hadoop/hdfs/web/TestWebHDFS.java | 10 +++---
.../hadoop/hdfs/web/TestWebHdfsTimeouts.java | 18 ++++++-----
.../web/TestWebHdfsWithMultipleNameNodes.java | 12 +++----
.../apache/hadoop/hdfs/web/WebHdfsTestUtil.java | 7 +++--
.../hadoop/hdfs/web/resources/TestParam.java | 6 ++--
.../apache/hadoop/security/TestPermission.java | 7 +++--
.../hadoop/security/TestPermissionSymlinks.java | 7 +++--
317 files changed, 1283 insertions(+), 1173 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLoggerSet.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLoggerSet.java
index c3d7071,6302b2a..f024b0e
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLoggerSet.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLoggerSet.java
@@@ -23,10 -23,9 +23,10 @@@ import java.util.List
import java.util.Map;
import java.util.concurrent.TimeoutException;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.GetJournaledEditsResponseProto;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.GetJournalStateResponseProto;
++import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.GetJournaledEditsResponseProto;
import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.NewEpochResponseProto;
import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.PrepareRecoveryResponseProto;
import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.SegmentStateProto;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumJournalManager.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumJournalManager.java
index ad053a3,ba2b20a..f96fe09
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumJournalManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumJournalManager.java
@@@ -67,18 -65,8 +67,18 @@@ import com.google.protobuf.TextFormat
*/
@InterfaceAudience.Private
public class QuorumJournalManager implements JournalManager {
- static final Log LOG = LogFactory.getLog(QuorumJournalManager.class);
+ static final Logger LOG = LoggerFactory.getLogger(QuorumJournalManager.class);
+ // This config is not publicly exposed
+ static final String QJM_RPC_MAX_TXNS_KEY =
+ "dfs.ha.tail-edits.qjm.rpc.max-txns";
+ static final int QJM_RPC_MAX_TXNS_DEFAULT = 5000;
+
+ // Maximum number of transactions to fetch at a time when using the
+ // RPC edit fetch mechanism
+ private final int maxTxnsPerRpc;
+ // Whether or not in-progress tailing is enabled in the configuration
+ private final boolean inProgressTailingEnabled;
// Timeouts for which the QJM will wait for each of the following actions.
private final int startSegmentTimeoutMs;
private final int prepareRecoveryTimeoutMs;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
index ccf8ba2,39afabc..9e204cb
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
@@@ -35,11 -32,10 +35,11 @@@ import java.util.List
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.Range;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.qjournal.protocol.JournalNotFormattedException;
import org.apache.hadoop.hdfs.qjournal.protocol.JournalOutOfSyncException;
import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocol;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeRpcServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EditLogFileInputStream.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java
index f533bc7,f7c3a27..f3bb954
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java
@@@ -40,11 -40,10 +40,11 @@@ import java.util.List
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeoutException;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.qjournal.MiniJournalCluster;
import org.apache.hadoop.hdfs.qjournal.QJMTestUtil;
import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.SegmentStateProto;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManagerUnit.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileInputStream.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileInputStream.java
index 0843bfe,3eca80f..3824b83
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileInputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileInputStream.java
@@@ -32,9 -32,8 +32,9 @@@ import java.net.HttpURLConnection
import java.net.URL;
import java.util.EnumMap;
+import com.google.protobuf.ByteString;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.fs.permission.PermissionStatus;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/HATestUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyInProgressTail.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyInProgressTail.java
index 0420579,2bdada4..8394073
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyInProgressTail.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyInProgressTail.java
@@@ -22,14 -21,12 +22,14 @@@ import static org.junit.Assert.assertNo
import static org.junit.Assert.assertNull;
import java.io.File;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.net.URI;
+import java.util.Iterator;
import java.util.List;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hdfs.DFSConfigKeys;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdmin.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c37db9d/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org