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 ae...@apache.org on 2017/12/07 00:54:35 UTC
[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240
Merge branch 'trunk' into HDFS-7240
Conflicts:
hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f16cdbd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f16cdbd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f16cdbd
Branch: refs/heads/HDFS-7240
Commit: 5f16cdbd28ef4484253fc8f789c42d90e26c3543
Parents: 15cce449 40b0045e
Author: Anu Engineer <ae...@apache.org>
Authored: Wed Dec 6 16:27:04 2017 -0800
Committer: Anu Engineer <ae...@apache.org>
Committed: Wed Dec 6 16:27:04 2017 -0800
----------------------------------------------------------------------
dev-support/bin/create-release | 71 ++-
.../hadoop-common/src/main/bin/hadoop | 7 +-
.../crypto/key/KeyProviderTokenIssuer.java | 36 ++
.../apache/hadoop/crypto/key/package-info.java | 18 +
.../java/org/apache/hadoop/fs/FileStatus.java | 61 ++-
.../java/org/apache/hadoop/fs/FileSystem.java | 15 +
.../org/apache/hadoop/fs/LocatedFileStatus.java | 42 +-
.../apache/hadoop/fs/RawLocalFileSystem.java | 77 ++-
.../hadoop/fs/permission/FsPermission.java | 34 ++
.../apache/hadoop/fs/protocolPB/PBHelper.java | 11 +-
.../org/apache/hadoop/io/nativeio/NativeIO.java | 34 ++
.../org/apache/hadoop/io/nativeio/NativeIO.c | 85 +++
.../src/site/markdown/Compatibility.md | 29 +-
.../apache/hadoop/fs/TestFilterFileSystem.java | 1 +
.../org/apache/hadoop/fs/TestHarFileSystem.java | 1 +
.../fs/TestRawLocalFileSystemContract.java | 87 ++-
.../hadoop/fs/permission/TestFsPermission.java | 31 ++
.../apache/hadoop/io/nativeio/TestNativeIO.java | 144 ++++-
.../apache/hadoop/test/GenericTestUtils.java | 10 +-
.../java/org/apache/hadoop/test/StatUtils.java | 126 +++++
.../src/test/scripts/hadoop_shell_execname.bats | 36 ++
.../dev-support/findbugsExcludeFile.xml | 31 ++
.../java/org/apache/hadoop/hdfs/DFSClient.java | 133 +----
.../org/apache/hadoop/hdfs/DFSUtilClient.java | 83 +--
.../hadoop/hdfs/DistributedFileSystem.java | 75 ++-
.../org/apache/hadoop/hdfs/HdfsKMSUtil.java | 190 +++++++
.../hdfs/client/HdfsClientConfigKeys.java | 4 +
.../impl/SnapshotDiffReportGenerator.java | 262 +++++++++
.../hadoop/hdfs/protocol/ClientProtocol.java | 29 +
.../hadoop/hdfs/protocol/HdfsFileStatus.java | 530 ++++++++++---------
.../hdfs/protocol/HdfsLocatedFileStatus.java | 208 ++++++--
.../hdfs/protocol/HdfsNamedFileStatus.java | 180 +++++++
.../hadoop/hdfs/protocol/LocatedBlocks.java | 3 +-
.../protocol/SnapshotDiffReportListing.java | 160 ++++++
.../hadoop/hdfs/protocol/package-info.java | 18 +
.../ClientNamenodeProtocolTranslatorPB.java | 24 +
.../hadoop/hdfs/protocolPB/PBHelperClient.java | 184 ++++++-
.../hadoop/hdfs/web/WebHdfsFileSystem.java | 37 +-
.../src/main/proto/ClientNamenodeProtocol.proto | 12 +
.../src/main/proto/hdfs.proto | 26 +
.../protocol/TestHdfsFileStatusMethods.java | 106 ++++
.../hadoop/fs/http/client/HttpFSFileSystem.java | 5 +-
.../dev-support/findbugsExcludeFile.xml | 7 -
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 1 +
.../hadoop-hdfs/src/main/bin/hdfs | 9 +-
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 5 +
.../java/org/apache/hadoop/hdfs/DFSUtil.java | 44 +-
...tNamenodeProtocolServerSideTranslatorPB.java | 22 +
.../qjournal/client/QuorumJournalManager.java | 6 +
.../server/blockmanagement/BlockManager.java | 51 +-
.../BlockReconstructionWork.java | 14 +-
.../blockmanagement/ErasureCodingWork.java | 4 +-
.../blockmanagement/PendingRecoveryBlocks.java | 143 +++++
.../server/blockmanagement/ReplicationWork.java | 4 +-
.../resolver/ActiveNamenodeResolver.java | 7 +-
.../resolver/MembershipNamenodeResolver.java | 3 +-
.../federation/resolver/MountTableResolver.java | 5 +-
.../resolver/NamenodeStatusReport.java | 8 +-
.../federation/router/ConnectionManager.java | 4 +-
.../federation/router/ConnectionPool.java | 4 +-
.../federation/router/FederationUtil.java | 2 +-
.../router/NamenodeHeartbeatService.java | 6 +-
.../hdfs/server/federation/router/Router.java | 6 +-
.../federation/router/RouterRpcClient.java | 22 +-
.../federation/router/RouterRpcServer.java | 13 +-
.../federation/store/CachedRecordStore.java | 7 +-
.../server/federation/store/RecordStore.java | 2 +-
.../store/driver/StateStoreDriver.java | 9 +-
.../driver/impl/StateStoreFileBaseImpl.java | 6 +-
.../driver/impl/StateStoreFileSystemImpl.java | 4 +-
.../driver/impl/StateStoreZooKeeperImpl.java | 5 +-
.../store/impl/MembershipStoreImpl.java | 5 +-
.../apache/hadoop/hdfs/server/mover/Mover.java | 2 +-
.../hdfs/server/namenode/FSDirSnapshotOp.java | 24 +
.../server/namenode/FSDirStatAndListingOp.java | 47 +-
.../hdfs/server/namenode/FSNamesystem.java | 117 +++-
.../hadoop/hdfs/server/namenode/INode.java | 14 +
.../hdfs/server/namenode/NameNodeRpcServer.java | 13 +
.../snapshot/DirectorySnapshottableFeature.java | 136 ++++-
.../snapshot/SnapshotDiffListingInfo.java | 207 ++++++++
.../namenode/snapshot/SnapshotManager.java | 28 +
.../hdfs/tools/DFSZKFailoverController.java | 6 +-
.../src/main/resources/hdfs-default.xml | 21 +
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 10 +
.../hadoop/hdfs/TestBlockStoragePolicy.java | 2 +-
.../apache/hadoop/hdfs/TestEncryptionZones.java | 40 +-
.../hadoop/hdfs/TestEncryptionZonesWithKMS.java | 23 +
.../apache/hadoop/hdfs/TestFileChecksum.java | 9 +-
.../apache/hadoop/hdfs/TestFileCreation.java | 103 ++++
.../hdfs/TestFileStatusSerialization.java | 8 +-
.../TestPendingRecoveryBlocks.java | 87 +++
.../hdfs/server/datanode/TestBlockRecovery.java | 107 ++++
.../hdfs/server/mover/TestStorageMover.java | 2 +-
.../hdfs/server/namenode/TestFileTruncate.java | 41 ++
.../namenode/ha/TestPipelinesFailover.java | 4 +-
.../namenode/ha/TestStandbyInProgressTail.java | 19 +
.../snapshot/TestSnapshotDiffReport.java | 116 ++++
.../src/test/scripts/hadoop_shell_execname.bats | 36 ++
hadoop-mapreduce-project/bin/mapred | 8 +-
.../hadoop/mapred/TaskAttemptListenerImpl.java | 69 ++-
.../job/event/TaskAttemptStatusUpdateEvent.java | 12 +-
.../v2/app/job/impl/TaskAttemptImpl.java | 20 +-
.../mapred/TestTaskAttemptListenerImpl.java | 315 +++++++----
.../mapreduce/v2/app/TestFetchFailure.java | 3 +-
.../mapreduce/v2/app/TestMRClientService.java | 4 +-
.../v2/TestSpeculativeExecutionWithMRApp.java | 13 +-
.../hadoop-mapreduce-client-uploader/pom.xml | 67 +++
.../hadoop/mapred/uploader/DefaultJars.java | 46 ++
.../mapred/uploader/FrameworkUploader.java | 384 ++++++++++++++
.../mapred/uploader/UploaderException.java | 36 ++
.../hadoop/mapred/uploader/package-info.java | 28 +
.../mapred/uploader/TestFrameworkUploader.java | 315 +++++++++++
.../hadoop-mapreduce-client/pom.xml | 1 +
.../plugin/versioninfo/VersionInfoMojo.java | 85 +--
hadoop-project/pom.xml | 2 +-
.../s3a/BlockingThreadPoolExecutorService.java | 7 +-
.../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 5 +
.../hadoop/fs/s3a/S3AInstrumentation.java | 107 +++-
.../fs/s3a/SemaphoredDelegatingExecutor.java | 15 +-
.../src/site/markdown/tools/hadoop-aws/index.md | 38 +-
.../tools/hadoop-aws/troubleshooting_s3a.md | 140 ++++-
.../ITestBlockingThreadPoolExecutorService.java | 2 +
.../apache/hadoop/fs/s3a/ITestS3AMetrics.java | 51 ++
hadoop-yarn-project/hadoop-yarn/bin/yarn | 3 +-
.../hadoop/yarn/api/records/Resource.java | 27 +-
.../yarn/api/records/ResourceInformation.java | 5 +-
.../hadoop/yarn/conf/YarnConfiguration.java | 27 +-
.../yarn/util/resource/ResourceUtils.java | 42 +-
.../distributedshell/ApplicationMaster.java | 22 +-
.../applications/distributedshell/Client.java | 19 +
.../distributedshell/TestDistributedShell.java | 56 ++
.../hadoop/yarn/service/webapp/ApiServer.java | 1 +
...RN-Simplified-V1-API-Layer-For-Services.yaml | 16 +
.../dev-support/findbugs-exclude.xml | 5 +-
.../yarn/service/ClientAMPolicyProvider.java | 39 ++
.../yarn/service/ClientAMSecurityInfo.java | 62 +++
.../hadoop/yarn/service/ClientAMService.java | 9 +
.../hadoop/yarn/service/ServiceContext.java | 8 +
.../hadoop/yarn/service/ServiceMaster.java | 140 ++++-
.../hadoop/yarn/service/ServiceScheduler.java | 30 +-
.../service/api/records/KerberosPrincipal.java | 146 +++++
.../yarn/service/api/records/Service.java | 23 +
.../yarn/service/client/ServiceClient.java | 174 ++++--
.../yarn/service/component/Component.java | 2 +-
.../yarn/service/conf/YarnServiceConf.java | 7 -
.../yarn/service/conf/YarnServiceConstants.java | 3 +
.../containerlaunch/AbstractLauncher.java | 39 +-
.../containerlaunch/ContainerLaunchService.java | 10 +-
.../containerlaunch/CredentialUtils.java | 319 -----------
.../hadoop/yarn/service/package-info.java | 24 +
.../yarn/service/provider/ProviderUtils.java | 53 +-
.../yarn/service/utils/ServiceApiUtil.java | 15 +
.../hadoop/yarn/service/utils/ServiceUtils.java | 31 +-
.../org.apache.hadoop.security.SecurityInfo | 14 +
.../apache/hadoop/yarn/client/cli/LogsCLI.java | 41 +-
.../AggregatedLogDeletionService.java | 90 ++--
.../client/YARNDelegationTokenIdentifier.java | 11 +
.../src/main/resources/yarn-default.xml | 44 +-
.../TestAggregatedLogDeletionService.java | 68 +++
.../yarn/security/TestYARNTokenIdentifier.java | 115 ++--
.../client/api/RegistryOperationsFactory.java | 21 +
.../registry/client/impl/zk/CuratorService.java | 8 +-
.../client/impl/zk/RegistrySecurity.java | 96 +++-
.../hadoop/registry/server/dns/RegistryDNS.java | 4 +
.../RMRegistryOperationsService.java | 246 ---------
.../services/DeleteCompletionCallback.java | 3 +-
.../hadoop/registry/AbstractRegistryTest.java | 15 +-
.../integration/TestRegistryRMOperations.java | 369 -------------
.../secure/TestSecureRMRegistryOperations.java | 348 ------------
.../records/OpportunisticContainersStatus.java | 19 +
.../pb/OpportunisticContainersStatusPBImpl.java | 13 +
.../main/proto/yarn_server_common_protos.proto | 1 +
.../linux/privileged/PrivilegedOperation.java | 1 +
.../resources/fpga/FpgaResourceAllocator.java | 413 +++++++++++++++
.../resources/fpga/FpgaResourceHandlerImpl.java | 220 ++++++++
.../runtime/DockerLinuxContainerRuntime.java | 63 ++-
.../runtime/docker/DockerVolumeCommand.java | 29 +-
.../resourceplugin/ResourcePluginManager.java | 8 +-
.../fpga/AbstractFpgaVendorPlugin.java | 90 ++++
.../resourceplugin/fpga/FpgaDiscoverer.java | 139 +++++
.../fpga/FpgaNodeResourceUpdateHandler.java | 71 +++
.../resourceplugin/fpga/FpgaResourcePlugin.java | 105 ++++
.../fpga/IntelFpgaOpenclPlugin.java | 396 ++++++++++++++
.../gpu/NvidiaDockerV1CommandPlugin.java | 2 +-
.../scheduler/ContainerScheduler.java | 12 +
.../nodemanager/webapp/AllContainersPage.java | 6 +-
.../nodemanager/webapp/NMWebServices.java | 4 +-
.../server/nodemanager/webapp/NodePage.java | 2 +
.../server/nodemanager/webapp/dao/NodeInfo.java | 9 +
.../main/native/container-executor/impl/util.c | 25 +-
.../main/native/container-executor/impl/util.h | 3 +-
.../container-executor/impl/utils/docker-util.c | 106 ++--
.../native/container-executor/test/test_util.cc | 160 +++++-
.../test/utils/test_docker_util.cc | 5 +-
.../resources/fpga/TestFpgaResourceHandler.java | 458 ++++++++++++++++
.../runtime/TestDockerContainerRuntime.java | 170 +++++-
.../resourceplugin/fpga/TestFpgaDiscoverer.java | 187 +++++++
.../nodemanager/webapp/TestNMWebServices.java | 26 +-
.../server/resourcemanager/AdminService.java | 21 +-
.../server/resourcemanager/RMAppManager.java | 60 ++-
.../server/resourcemanager/ResourceManager.java | 31 +-
.../monitor/SchedulingMonitor.java | 3 +-
.../monitor/SchedulingMonitorManager.java | 184 +++++++
.../placement/PlacementManager.java | 5 +-
.../recovery/FileSystemRMStateStore.java | 4 +-
.../recovery/LeveldbRMStateStore.java | 5 +-
.../recovery/RMStateStoreUtils.java | 69 +++
.../recovery/ZKRMStateStore.java | 3 +-
.../RMDelegationTokenIdentifierData.java | 8 +
.../server/resourcemanager/rmapp/RMApp.java | 8 +
.../server/resourcemanager/rmapp/RMAppImpl.java | 80 +--
.../rmcontainer/RMContainer.java | 5 +-
.../rmcontainer/RMContainerImpl.java | 20 +-
.../scheduler/AbstractYarnScheduler.java | 32 +-
.../scheduler/AppSchedulingInfo.java | 66 ++-
.../scheduler/ClusterNodeTracker.java | 79 ++-
.../scheduler/ContainerUpdateContext.java | 11 +-
.../scheduler/SchedulerApplicationAttempt.java | 15 +-
.../scheduler/capacity/CapacityScheduler.java | 6 +
.../allocator/RegularContainerAllocator.java | 3 +-
.../scheduler/common/ContainerRequest.java | 54 ++
.../scheduler/common/fica/FiCaSchedulerApp.java | 15 +-
.../distributed/NodeQueueLoadMonitor.java | 22 +-
.../scheduler/fair/FSAppAttempt.java | 5 +-
.../scheduler/fair/FairScheduler.java | 6 +
.../scheduler/fifo/FifoAppAttempt.java | 5 +-
.../scheduler/fifo/FifoScheduler.java | 6 +
.../placement/AppPlacementAllocator.java | 19 +-
.../LocalityAppPlacementAllocator.java | 32 +-
.../placement/PendingAskUpdateResult.java | 65 +++
.../placement/ResourceRequestUpdateResult.java | 43 --
.../server/resourcemanager/Application.java | 6 +-
.../yarn/server/resourcemanager/MockNodes.java | 4 +
.../server/resourcemanager/RMHATestBase.java | 30 +-
.../server/resourcemanager/TestAppManager.java | 110 +++-
.../resourcemanager/TestClientRMTokens.java | 44 ++
.../applicationsmanager/MockAsm.java | 7 +
.../monitor/TestSchedulingMonitor.java | 41 ++
...estProportionalCapacityPreemptionPolicy.java | 22 +-
.../recovery/TestRMStateStoreUtils.java | 81 +++
.../server/resourcemanager/rmapp/MockRMApp.java | 7 +
.../rmcontainer/TestRMContainerImpl.java | 8 +-
.../scheduler/TestClusterNodeTracker.java | 125 ++++-
.../capacity/TestCapacityScheduler.java | 3 +-
.../TestCapacitySchedulerLazyPreemption.java | 36 +-
...TestCapacitySchedulerSurgicalPreemption.java | 40 +-
.../distributed/TestNodeQueueLoadMonitor.java | 21 +
...ebServicesDelegationTokenAuthentication.java | 15 +-
.../src/site/markdown/CapacityScheduler.md | 10 +
.../site/markdown/OpportunisticContainers.md | 212 --------
.../site/markdown/OpportunisticContainers.md.vm | 233 ++++++++
.../site/markdown/yarn-service/QuickStart.md | 20 +-
.../markdown/yarn-service/YarnServiceAPI.md | 11 +-
.../src/main/webapp/app/adapters/yarn-log.js | 39 ++
.../webapp/app/components/collapsible-panel.js | 64 +++
.../main/webapp/app/components/timeline-view.js | 6 +-
.../main/webapp/app/components/tree-selector.js | 2 +-
.../webapp/app/controllers/yarn-app-attempt.js | 2 +-
.../webapp/app/controllers/yarn-app/logs.js | 204 +++++++
.../main/webapp/app/controllers/yarn-queue.js | 6 +-
.../webapp/app/controllers/yarn-queue/apps.js | 6 +-
.../src/main/webapp/app/models/yarn-log.js | 27 +
.../app/models/yarn-queue/capacity-queue.js | 11 +-
.../src/main/webapp/app/models/yarn-rm-node.js | 6 +-
.../src/main/webapp/app/router.js | 1 +
.../main/webapp/app/routes/yarn-app-attempt.js | 4 +-
.../main/webapp/app/routes/yarn-app/attempts.js | 4 +-
.../src/main/webapp/app/routes/yarn-app/logs.js | 47 ++
.../src/main/webapp/app/serializers/yarn-log.js | 48 ++
.../src/main/webapp/app/styles/app.scss | 58 +-
.../src/main/webapp/app/styles/compose-box.scss | 39 ++
.../src/main/webapp/app/styles/layout.scss | 4 +
.../src/main/webapp/app/styles/variables.scss | 3 +-
.../templates/components/collapsible-panel.hbs | 21 +
.../templates/components/node-menu-panel.hbs | 2 +-
.../app/templates/components/timeline-view.hbs | 66 +--
.../yarn-queue/capacity-queue-info.hbs | 51 +-
.../components/yarn-queue/capacity-queue.hbs | 81 +--
.../components/yarn-queue/fair-queue.hbs | 66 +--
.../components/yarn-queue/fifo-queue.hbs | 43 +-
.../webapp/app/templates/yarn-app-attempt.hbs | 21 +-
.../src/main/webapp/app/templates/yarn-app.hbs | 3 +
.../webapp/app/templates/yarn-app/attempts.hbs | 13 +
.../main/webapp/app/templates/yarn-app/logs.hbs | 132 +++++
.../webapp/app/templates/yarn-node-apps.hbs | 2 +-
.../app/templates/yarn-node-containers.hbs | 2 +-
.../app/templates/yarn-node/yarn-nm-gpu.hbs | 4 +
.../main/webapp/app/templates/yarn-queue.hbs | 73 ++-
.../webapp/app/templates/yarn-queue/apps.hbs | 15 +-
.../webapp/app/templates/yarn-queue/info.hbs | 17 +-
.../main/webapp/app/templates/yarn-queues.hbs | 5 +-
.../src/main/webapp/bower-shrinkwrap.json | 12 +-
.../components/collapsible-panel-test.js | 43 ++
.../webapp/tests/unit/adapters/yarn-log-test.js | 30 ++
.../unit/controllers/yarn-app/logs-test.js | 30 ++
.../webapp/tests/unit/models/yarn-log-test.js | 30 ++
.../tests/unit/routes/yarn-app/logs-test.js | 29 +
.../tests/unit/serializers/yarn-log-test.js | 33 ++
298 files changed, 12277 insertions(+), 3476 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f16cdbd/hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml
index 8e5b6ee,8e2bc94..5503cb2
--- a/hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml
@@@ -61,10 -63,33 +63,39 @@@
<Bug pattern="IS2_INCONSISTENT_SYNC" />
</Match>
+ <Match>
+ <Package name="org.apache.hadoop.ozone.protocol.proto" />
+ </Match>
+ <Match>
+ <Package name="org.apache.hadoop.hdfs.ozone.protocol.proto" />
+ </Match>
++
+ <!-- BlockLocations are user-facing, but LocatedBlocks are not. -->
+ <Match>
+ <Class name="org.apache.hadoop.hdfs.protocol.HdfsLocatedFileStatus" />
+ <Field name="hdfsloc" />
+ <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
+ </Match>
+
+ <!-- Hdfs*FileStatus are internal types. This "internal" state is not sensitive. -->
+ <Match>
+ <Class name="org.apache.hadoop.hdfs.protocol.HdfsNamedFileStatus" />
+ <Method name="getLocalNameInBytes" />
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.hdfs.protocol.HdfsNamedFileStatus" />
+ <Method name="getSymlinkInBytes" />
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.hdfs.protocol.HdfsLocatedFileStatus" />
+ <Method name="getLocalNameInBytes" />
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.hdfs.protocol.HdfsLocatedFileStatus" />
+ <Method name="getSymlinkInBytes" />
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
-
</FindBugsFilter>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f16cdbd/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelperClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f16cdbd/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f16cdbd/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f16cdbd/hadoop-hdfs-project/hadoop-hdfs/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f16cdbd/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f16cdbd/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f16cdbd/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
index fadc554,2d710be..b8157c8
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@@ -3108,12 -3100,21 +3108,22 @@@ public class MiniDFSCluster implements
// Wait for new namenode to get registrations from all the datanodes
waitActive(nnIndex);
}
+
+ /**
+ * Sets the timeout for re-issuing a block recovery.
+ */
+ public void setBlockRecoveryTimeout(long timeout) {
+ for (int nnIndex = 0; nnIndex < getNumNameNodes(); nnIndex++) {
+ getNamesystem(nnIndex).getBlockManager().setBlockRecoveryTimeout(
+ timeout);
+ }
+ }
- protected void setupDatanodeAddress(Configuration conf, boolean setupHostsFile,
- boolean checkDataNodeAddrConfig) throws IOException {
+ protected void setupDatanodeAddress(
+ int i, Configuration dnConf, boolean setupHostsFile,
+ boolean checkDataNodeAddrConfig) throws IOException {
if (setupHostsFile) {
- String hostsFile = conf.get(DFS_HOSTS, "").trim();
+ String hostsFile = dnConf.get(DFS_HOSTS, "").trim();
if (hostsFile.length() == 0) {
throw new IOException("Parameter dfs.hosts is not setup in conf");
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f16cdbd/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestPipelinesFailover.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f16cdbd/hadoop-project/pom.xml
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org