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 su...@apache.org on 2018/08/08 20:12:30 UTC
[49/50] [abbrv] hadoop git commit: Merge branch 'trunk' into
HDFS-12943
Merge branch 'trunk' 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/3d54a964
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3d54a964
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3d54a964
Branch: refs/heads/HDFS-12943
Commit: 3d54a96434de20013d6c47dd143c8599ae4952a1
Parents: 2dad24f 3214cd7
Author: Chao Sun <su...@apache.org>
Authored: Wed Aug 8 13:10:43 2018 -0700
Committer: Chao Sun <su...@apache.org>
Committed: Wed Aug 8 13:10:43 2018 -0700
----------------------------------------------------------------------
.../src/main/bin/hadoop-functions.sh | 1 +
.../hadoop/fs/FileSystemMultipartUploader.java | 69 +-
.../org/apache/hadoop/fs/MultipartUploader.java | 32 +-
.../java/org/apache/hadoop/fs/PartHandle.java | 8 +-
.../java/org/apache/hadoop/fs/PathHandle.java | 9 +-
.../main/java/org/apache/hadoop/ipc/Client.java | 6 +-
.../hadoop-common/src/site/markdown/Metrics.md | 8 +-
.../markdown/release/3.1.1/CHANGES.3.1.1.md | 498 +++
.../release/3.1.1/RELEASENOTES.3.1.1.md | 498 +++
.../fs/AbstractSystemMultipartUploaderTest.java | 143 -
.../TestLocalFileSystemMultipartUploader.java | 65 -
.../AbstractContractMultipartUploaderTest.java | 300 ++
.../TestLocalFSContractMultipartUploader.java | 43 +
.../src/main/compose/ozone/docker-config | 1 +
.../org/apache/hadoop/hdds/HddsConfigKeys.java | 4 +
.../common/src/main/resources/ozone-default.xml | 13 +-
.../container/common/interfaces/Container.java | 8 +
.../server/ratis/ContainerStateMachine.java | 142 +-
.../server/ratis/XceiverServerRatis.java | 10 +-
.../container/common/volume/VolumeSet.java | 15 +-
.../container/keyvalue/KeyValueContainer.java | 8 +-
.../container/keyvalue/KeyValueHandler.java | 14 +-
.../keyvalue/TestKeyValueContainer.java | 58 +-
.../container/keyvalue/TestKeyValueHandler.java | 46 +-
.../scm/container/ContainerActionsHandler.java | 60 +
.../hadoop/hdds/scm/events/SCMEvents.java | 16 +-
.../server/SCMDatanodeHeartbeatDispatcher.java | 22 +
.../scm/server/StorageContainerManager.java | 3 +
.../container/TestContainerActionsHandler.java | 68 +
.../hadoop/hdfs/protocol/ECBlockGroupStats.java | 27 +-
.../hdfs/protocol/ReplicatedBlockStats.java | 28 +-
.../hadoop/hdfs/protocolPB/PBHelperClient.java | 21 +
.../src/main/proto/ClientNamenodeProtocol.proto | 3 +
.../federation/metrics/NamenodeBeanMetrics.java | 10 +
.../server/federation/router/ErasureCoding.java | 13 +
.../jdiff/Apache_Hadoop_HDFS_3.1.1.xml | 676 ++++
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 19 +-
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 2 +
.../aliasmap/InMemoryLevelDBAliasMapServer.java | 8 +-
.../server/blockmanagement/BlockManager.java | 8 +
.../BlockPlacementPolicyDefault.java | 4 +-
.../blockmanagement/LowRedundancyBlocks.java | 28 +
.../datamodel/DiskBalancerVolume.java | 17 +-
.../ContentSummaryComputationContext.java | 2 +
.../hdfs/server/namenode/FSNamesystem.java | 20 +-
.../hdfs/server/namenode/NameNodeMXBean.java | 18 +
.../hdfs/server/namenode/ha/EditLogTailer.java | 3 +-
.../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 10 +
.../org/apache/hadoop/hdfs/tools/ECAdmin.java | 4 +-
.../src/main/resources/hdfs-default.xml | 9 +
.../src/site/markdown/HDFSErasureCoding.md | 4 +-
.../hadoop/fs/TestHDFSMultipartUploader.java | 76 -
.../hdfs/TestHDFSContractMultipartUploader.java | 58 +
.../hadoop/hdfs/TestErasureCodingPolicies.java | 14 +
.../TestLowRedundancyBlockQueues.java | 43 +-
.../server/diskbalancer/TestDataModels.java | 16 +
.../namenode/metrics/TestNameNodeMetrics.java | 12 +
.../apache/hadoop/hdfs/tools/TestDFSAdmin.java | 32 +-
.../test/resources/testErasureCodingConf.xml | 22 +-
.../src/test/acceptance/ozonefs/ozonefs.robot | 4 +-
.../acceptance/ozonefs/ozonesinglenode.robot | 49 +
hadoop-ozone/common/src/main/bin/ozone | 4 +
.../src/main/shellprofile.d/hadoop-ozone.sh | 1 +
.../org/apache/hadoop/ozone/om/OMMetrics.java | 2 +-
.../apache/hadoop/ozone/web/ozShell/Shell.java | 4 +
.../ozone/web/ozShell/keys/PutKeyHandler.java | 16 +-
hadoop-project-dist/pom.xml | 2 +-
hadoop-project/pom.xml | 2 +-
.../hadoop/fs/s3a/S3AMultipartUploader.java | 177 +-
.../hadoop/fs/s3a/WriteOperationHelper.java | 4 +
...rg.apache.hadoop.fs.MultipartUploaderFactory | 15 -
...rg.apache.hadoop.fs.MultipartUploaderFactory | 15 +
.../site/markdown/tools/hadoop-aws/s3guard.md | 51 +-
.../s3a/ITestS3AContractMultipartUploader.java | 116 +
.../apache/hadoop/fs/s3a/S3ATestConstants.java | 5 +
.../fs/s3a/TestS3AMultipartUploaderSupport.java | 84 +
.../TestStagingPartitionedJobCommit.java | 4 +-
.../ITestS3AFileContextMainOperations.java | 6 +
.../fs/s3a/scale/AbstractSTestS3AHugeFiles.java | 4 +-
.../src/test/resources/contract/s3a.xml | 5 +
.../jdiff/Apache_Hadoop_YARN_Client_3.1.1.xml | 2920 +++++++++++++++
.../jdiff/Apache_Hadoop_YARN_Common_3.1.1.xml | 3327 ++++++++++++++++++
.../yarn/api/records/ResourceInformation.java | 2 +-
.../yarn/util/resource/ResourceUtils.java | 7 +
.../yarn/conf/TestResourceInformation.java | 2 +-
.../yarn/service/client/ServiceClient.java | 2 +-
.../component/instance/ComponentInstance.java | 22 +-
.../hadoop/yarn/client/cli/ApplicationCLI.java | 2 +
.../hadoop/yarn/client/cli/TestYarnCLI.java | 1 +
.../api/records/impl/pb/ResourcePBImpl.java | 14 +-
.../LogAggregationFileController.java | 4 +-
.../resource/DominantResourceCalculator.java | 65 +-
.../hadoop/yarn/util/resource/Resources.java | 43 +-
.../src/main/resources/yarn-default.xml | 13 +-
.../hadoop/yarn/api/TestResourcePBImpl.java | 90 +
.../yarn/util/resource/TestResourceUtils.java | 40 +
.../resource-types/node-resources-3.xml | 33 +
.../hadoop/registry/server/dns/LookupTask.java | 39 +
.../hadoop/registry/server/dns/RegistryDNS.java | 21 +-
.../registry/server/dns/TestRegistryDNS.java | 8 +
.../amrmproxy/AbstractAMRMProxyPolicy.java | 8 +
.../amrmproxy/BroadcastAMRMProxyPolicy.java | 7 -
.../policies/amrmproxy/HomeAMRMProxyPolicy.java | 74 +
.../amrmproxy/RejectAMRMProxyPolicy.java | 8 -
.../policies/manager/HomePolicyManager.java | 61 +
.../amrmproxy/TestHomeAMRMProxyPolicy.java | 110 +
.../policies/manager/TestHomePolicyManager.java | 39 +
.../utils/FederationPoliciesTestUtil.java | 16 +-
.../nodemanager/LinuxContainerExecutor.java | 6 +-
.../linux/resources/CGroupsHandlerImpl.java | 26 +-
.../runtime/DockerLinuxContainerRuntime.java | 17 +-
.../linux/runtime/docker/DockerClient.java | 53 -
.../linux/runtime/docker/DockerCommand.java | 6 +-
.../runtime/docker/DockerCommandExecutor.java | 15 +-
.../runtime/docker/DockerInspectCommand.java | 3 +-
.../linux/runtime/docker/DockerRmCommand.java | 3 +-
.../linux/runtime/docker/TestDockerClient.java | 2 +-
.../docker/TestDockerCommandExecutor.java | 20 +-
.../server/resourcemanager/ResourceManager.java | 4 +
.../scheduler/fair/FairScheduler.java | 9 +-
.../resourcemanager/webapp/RMWSConsts.java | 3 +
.../webapp/RMWebServiceProtocol.java | 10 +
.../resourcemanager/webapp/RMWebServices.java | 12 +
.../webapp/dao/ClusterUserInfo.java | 64 +
.../resourcemanager/TestClientRMService.java | 88 +
.../fair/TestFairSchedulerConfiguration.java | 2 +-
...TestFairSchedulerWithMultiResourceTypes.java | 127 +
.../webapp/TestRMWebServices.java | 21 +
.../webapp/DefaultRequestInterceptorREST.java | 8 +
.../webapp/FederationInterceptorREST.java | 6 +
.../server/router/webapp/RouterWebServices.java | 12 +
.../webapp/MockRESTRequestInterceptor.java | 6 +
.../PassThroughRESTRequestInterceptor.java | 6 +
.../src/site/markdown/DockerContainers.md | 80 +-
.../webapp/app/adapters/cluster-user-info.js | 29 +
.../main/webapp/app/adapters/yarn-servicedef.js | 11 +-
...er-app-memusage-by-nodes-stacked-barchart.js | 12 +-
...app-ncontainers-by-nodes-stacked-barchart.js | 2 -
...-app-vcoreusage-by-nodes-stacked-barchart.js | 85 +
.../webapp/app/controllers/app-table-columns.js | 7 +
.../main/webapp/app/controllers/application.js | 10 +-
.../src/main/webapp/app/controllers/yarn-app.js | 10 +-
.../webapp/app/controllers/yarn-app/info.js | 45 +-
.../webapp/app/controllers/yarn-apps/apps.js | 4 +-
.../app/controllers/yarn-deploy-service.js | 8 +-
.../main/webapp/app/models/cluster-user-info.js | 24 +
.../src/main/webapp/app/routes/application.js | 6 +-
.../webapp/app/serializers/cluster-user-info.js | 43 +
.../src/main/webapp/app/serializers/yarn-app.js | 2 +-
.../src/main/webapp/app/styles/app.scss | 12 +-
.../main/webapp/app/templates/application.hbs | 15 +-
.../src/main/webapp/app/templates/yarn-app.hbs | 21 +-
.../webapp/app/templates/yarn-app/charts.hbs | 8 +
.../main/webapp/app/templates/yarn-app/info.hbs | 19 +-
.../templates/yarn-component-instance/info.hbs | 2 +-
.../src/main/webapp/app/utils/date-utils.js | 14 +-
156 files changed, 11106 insertions(+), 815 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3d54a964/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3d54a964/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3d54a964/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ClientNamenodeProtocol.proto
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3d54a964/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3d54a964/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/3d54a964/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/3d54a964/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org