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/07/27 23:49:05 UTC

[34/34] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/52640fb8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/52640fb8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/52640fb8

Branch: refs/heads/HDFS-7240
Commit: 52640fb8841db16f0870379848f70514c066cebc
Parents: 5e47076 e3c7300
Author: Anu Engineer <ae...@apache.org>
Authored: Thu Jul 27 16:44:36 2017 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Thu Jul 27 16:44:36 2017 -0700

----------------------------------------------------------------------
 .../hadoop-client-minicluster/pom.xml           |   4 +
 .../org/apache/hadoop/fs/viewfs/Constants.java  |   2 +
 .../apache/hadoop/fs/viewfs/ViewFileSystem.java |  79 +++--
 .../org/apache/hadoop/fs/viewfs/ViewFs.java     |  43 +--
 .../apache/hadoop/io/erasurecode/CodecUtil.java |  14 +-
 .../io/erasurecode/ErasureCodeNative.java       |   5 +
 .../main/java/org/apache/hadoop/ipc/Client.java |  34 +-
 .../hadoop/security/UserGroupInformation.java   |   5 +-
 .../apache/hadoop/util/FastNumberFormat.java    |  44 +++
 .../org/apache/hadoop/crypto/OpensslCipher.c    |  46 ++-
 .../src/main/resources/core-default.xml         |  19 +-
 .../conf/TestCommonConfigurationFields.java     |   2 +
 .../hadoop/fs/contract/ContractTestUtils.java   |  54 ++++
 .../fs/viewfs/ViewFileSystemBaseTest.java       |  79 ++++-
 .../apache/hadoop/fs/viewfs/ViewFsBaseTest.java |  94 +++++-
 .../java/org/apache/hadoop/ipc/TestIPC.java     |  76 +++++
 .../org/apache/hadoop/test/MockitoMaker.java    | 132 --------
 .../org/apache/hadoop/util/TestDiskChecker.java |  12 +-
 .../hadoop/util/TestFastNumberFormat.java       |  46 +++
 .../src/main/conf/httpfs-env.sh                 |   2 +-
 .../fs/http/server/HttpFSServerWebServer.java   |   2 -
 .../libexec/shellprofile.d/hadoop-httpfs.sh     |  16 +-
 .../src/site/markdown/ServerSetup.md.vm         |   1 -
 .../hadoop/fs/http/server/TestHttpFSServer.java | 106 ++++---
 .../fs/http/server/TestHttpFSServerNoACLs.java  |  15 +-
 .../http/server/TestHttpFSServerNoXAttrs.java   |  10 +-
 .../hadoop/hdfs/server/balancer/Dispatcher.java |  36 ++-
 .../blockmanagement/DatanodeDescriptor.java     |  19 +-
 .../hadoop/hdfs/server/datanode/DataNode.java   |   2 +-
 .../datanode/fsdataset/impl/FsDatasetImpl.java  |  20 +-
 .../server/namenode/EncryptionZoneManager.java  |   5 +-
 .../server/namenode/FSDirErasureCodingOp.java   |   5 +-
 .../namenode/INodeWithAdditionalFields.java     |  24 +-
 .../hdfs/server/namenode/INodesInPath.java      |  19 +-
 .../org/apache/hadoop/hdfs/tools/DFSAdmin.java  |   8 +-
 .../fs/viewfs/TestViewFileSystemHdfs.java       |  22 ++
 .../fsdataset/impl/FsDatasetImplTestUtils.java  |  10 +
 .../fsdataset/impl/TestWriteToReplica.java      |  53 +++-
 .../hdfs/server/namenode/TestDeadDatanode.java  |  53 ++++
 .../server/namenode/TestSnapshotPathINodes.java |   5 +-
 .../src/test/resources/testHDFSConf.xml         | 125 +++++++-
 .../v2/app/metrics/TestMRAppMetrics.java        |   9 +-
 .../v2/app/rm/TestRMContainerAllocator.java     |   7 +-
 .../lib/input/TestMRCJCFileInputFormat.java     |  11 +-
 .../hadoop/mapred/TestShuffleHandler.java       |  32 +-
 .../fs/azure/AzureNativeFileSystemStore.java    | 144 +++++----
 .../hadoop/fs/azure/BlockBlobInputStream.java   |   2 +-
 .../hadoop-azure/src/site/markdown/index.md     |  13 +
 .../fs/azure/TestBlockBlobInputStream.java      |  50 ++-
 .../fs/azure/TestWasbUriAndConfiguration.java   |  48 +++
 .../src/test/resources/azure-test.xml           |   5 +
 .../src/site/markdown/DistCp.md.vm              |   2 +-
 .../src/main/native/pipes/impl/HadoopPipes.cc   |  12 +-
 .../org/apache/hadoop/yarn/sls/SLSRunner.java   |  28 +-
 .../src/site/markdown/SchedulerLoadSimulator.md |   3 +-
 .../yarn/api/records/ApplicationAttemptId.java  |  77 +++--
 .../hadoop/yarn/api/records/ApplicationId.java  |  54 ++--
 .../hadoop/yarn/api/records/ContainerId.java    | 139 ++++-----
 .../hadoop/yarn/api/records/ReservationId.java  |  21 +-
 .../yarn/client/api/impl/AMRMClientImpl.java    |   4 +-
 .../impl/pb/ContainerLaunchContextPBImpl.java   |   8 +
 .../TestApplicationClientProtocolRecords.java   |  52 ++++
 .../client/binding/RegistryPathUtils.java       |   2 +-
 .../hadoop/registry/client/types/Endpoint.java  |   4 +-
 .../registry/client/types/ServiceRecord.java    |   4 +-
 .../hadoop-yarn-server-nodemanager/pom.xml      |   4 +
 .../containermanager/ContainerManagerImpl.java  |   6 +
 .../runtime/DockerLinuxContainerRuntime.java    |  67 +++-
 .../linux/runtime/docker/DockerRunCommand.java  |   6 +
 .../impl/container-executor.c                   |   4 +
 .../test/test-container-executor.c              |  16 +-
 .../containermanager/TestContainerManager.java  |  90 ++++++
 .../runtime/TestDockerContainerRuntime.java     |  58 +++-
 ...ActiveStandbyElectorBasedElectorService.java |  12 +-
 .../server/resourcemanager/AdminService.java    |  71 +++--
 .../CuratorBasedElectorService.java             |  10 +-
 .../resourcemanager/RMActiveServiceContext.java |  36 +--
 .../server/resourcemanager/RMContextImpl.java   | 312 ++++++++++---------
 .../resourcemanager/RMServiceContext.java       | 162 ++++++++++
 .../server/resourcemanager/ResourceManager.java |  35 ++-
 .../metrics/TimelineServiceV2Publisher.java     |   6 +-
 .../scheduler/fair/FSLeafQueue.java             |   2 -
 .../DominantResourceFairnessPolicy.java         |   2 +
 .../fair/policies/FairSharePolicy.java          | 125 +++++---
 .../RMTimelineCollectorManager.java             |  10 +-
 .../yarn/server/resourcemanager/MockRM.java     |  16 +-
 .../resourcemanager/MockRMMemoryStateStore.java |  32 ++
 .../resourcemanager/TestApplicationCleanup.java |  30 +-
 .../TestContainerResourceUsage.java             |   8 +-
 .../TestNodeBlacklistingOnAMFailures.java       |   8 +-
 .../resourcemanager/TestRMEmbeddedElector.java  |   8 +-
 .../yarn/server/resourcemanager/TestRMHA.java   |  28 +-
 .../server/resourcemanager/TestRMRestart.java   | 228 ++++++--------
 .../TestWorkPreservingRMRestart.java            | 117 +++----
 .../applicationsmanager/TestAMRestart.java      |  29 +-
 .../TestSystemMetricsPublisherForV2.java        |  13 +-
 .../rmapp/TestApplicationLifetimeMonitor.java   |   7 +-
 .../scheduler/TestAbstractYarnScheduler.java    |   7 +-
 .../scheduler/TestQueueMetrics.java             |  14 +-
 .../capacity/TestApplicationPriority.java       |  18 +-
 .../capacity/TestCapacityScheduler.java         |  23 +-
 ...TestWorkPreservingRMRestartForNodeLabel.java |  10 +-
 .../scheduler/fair/TestFairScheduler.java       |   8 +-
 .../security/TestDelegationTokenRenewer.java    |   5 +-
 .../security/TestRMDelegationTokens.java        |   9 +-
 .../server/TestContainerManagerSecurity.java    |  74 +++--
 pom.xml                                         |   2 +-
 107 files changed, 2486 insertions(+), 1321 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/52640fb8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/52640fb8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org