Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1BB50200BD5 for ; Thu, 8 Dec 2016 23:29:40 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1A6EC160B1F; Thu, 8 Dec 2016 22:29:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 165EB160B27 for ; Thu, 8 Dec 2016 23:29:38 +0100 (CET) Received: (qmail 84907 invoked by uid 500); 8 Dec 2016 22:29:11 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 82034 invoked by uid 99); 8 Dec 2016 22:29:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Dec 2016 22:29:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 85FA5F1597; Thu, 8 Dec 2016 22:29:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stevel@apache.org To: common-commits@hadoop.apache.org Date: Thu, 08 Dec 2016 22:29:57 -0000 Message-Id: <4cb69391c629410b96a3a449443605c7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into s3guard/HADOOP-13345 archived-at: Thu, 08 Dec 2016 22:29:40 -0000 Merge branch 'trunk' into s3guard/HADOOP-13345 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/881de1fb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/881de1fb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/881de1fb Branch: refs/heads/HADOOP-13345 Commit: 881de1fba7299fb534d4cb3aae467ae2dd3dd9ee Parents: 013a3c4 c265515 Author: Steve Loughran Authored: Thu Dec 8 17:58:10 2016 +0000 Committer: Steve Loughran Committed: Thu Dec 8 17:58:10 2016 +0000 ---------------------------------------------------------------------- BUILDING.txt | 11 +- LICENSE.txt | 2 +- dev-support/bin/qbt | 0 .../util/ZKSignerSecretProvider.java | 2 +- hadoop-common-project/hadoop-common/pom.xml | 4 + .../apache/hadoop/crypto/key/KeyProvider.java | 28 + .../crypto/key/KeyProviderCryptoExtension.java | 94 +- .../crypto/key/kms/KMSClientProvider.java | 77 +- .../hadoop/crypto/key/kms/KMSRESTConstants.java | 1 + .../key/kms/LoadBalancingKMSClientProvider.java | 18 + .../org/apache/hadoop/fs/FilterFileSystem.java | 7 + .../org/apache/hadoop/fs/LocalDirAllocator.java | 2 +- .../apache/hadoop/fs/shell/CommandFormat.java | 2 +- .../apache/hadoop/fs/viewfs/ViewFileSystem.java | 18 + .../io/erasurecode/ErasureCodeConstants.java | 3 + .../io/erasurecode/rawcoder/util/GF256.java | 2 +- .../org/apache/hadoop/io/file/tfile/TFile.java | 2 +- .../org/apache/hadoop/io/file/tfile/Utils.java | 2 +- .../org/apache/hadoop/net/NetworkTopology.java | 162 +- .../java/org/apache/hadoop/security/KDiag.java | 2 +- .../alias/LocalJavaKeyStoreProvider.java | 2 +- .../security/ssl/FileBasedKeyStoresFactory.java | 6 +- .../security/ssl/ReloadingX509TrustManager.java | 2 +- .../src/main/native/gtest/gtest-all.cc | 10403 ++++++++ .../src/main/native/gtest/include/gtest/gtest.h | 21192 +++++++++++++++++ .../resources/common-version-info.properties | 4 +- .../conf/TestConfigurationFieldsBase.java | 20 +- .../key/TestKeyProviderCryptoExtension.java | 114 + .../fs/FileContextMainOperationsBaseTest.java | 21 +- .../hadoop/fs/FileSystemContractBaseTest.java | 17 +- .../apache/hadoop/fs/TestFilterFileSystem.java | 12 +- .../fs/viewfs/ViewFileSystemBaseTest.java | 29 + .../ssl/TestReloadingX509TrustManager.java | 18 + ...rKeyGeneratorKeyProviderCryptoExtension.java | 7 +- .../hadoop/crypto/key/kms/server/KMS.java | 38 +- .../hadoop/crypto/key/kms/server/KMSAudit.java | 4 +- .../hadoop/crypto/key/kms/server/KMSWebApp.java | 7 +- .../kms/server/KeyAuthorizationKeyProvider.java | 13 + .../hadoop-kms/src/site/markdown/index.md.vm | 39 +- .../hadoop/crypto/key/kms/server/TestKMS.java | 90 +- .../crypto/key/kms/server/TestKMSAudit.java | 11 +- .../hadoop/hdfs/protocol/HdfsConstants.java | 1 + .../apache/hadoop/hdfs/web/JsonUtilClient.java | 49 + .../hadoop/hdfs/web/WebHdfsFileSystem.java | 46 + .../hadoop/hdfs/web/resources/GetOpParam.java | 3 + .../hadoop/hdfs/web/resources/PostOpParam.java | 2 + .../hadoop/hdfs/web/resources/PutOpParam.java | 1 + .../hdfs/web/resources/StoragePolicyParam.java | 43 + .../hadoop/fs/http/client/HttpFSFileSystem.java | 92 +- .../hadoop/fs/http/server/FSOperations.java | 130 + .../http/server/HttpFSParametersProvider.java | 23 + .../hadoop/fs/http/server/HttpFSServer.java | 35 + .../src/site/markdown/ServerSetup.md.vm | 2 +- .../src/site/markdown/index.md | 6 +- .../fs/http/client/BaseTestHttpFSWith.java | 52 +- .../main/native/fuse-dfs/fuse_dfs_wrapper.sh | 2 +- .../dev-support/findbugsExcludeFile.xml | 27 + .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 2 +- .../apache/hadoop/hdfs/protocolPB/PBHelper.java | 76 +- .../server/blockmanagement/BlockManager.java | 79 +- .../server/blockmanagement/DatanodeManager.java | 12 +- .../hdfs/server/datanode/BPOfferService.java | 10 +- .../hdfs/server/datanode/BPServiceActor.java | 4 +- .../hdfs/server/datanode/BlockReceiver.java | 66 +- .../hdfs/server/datanode/BlockSender.java | 105 +- .../hadoop/hdfs/server/datanode/DNConf.java | 4 + .../hadoop/hdfs/server/datanode/DataNode.java | 2 +- .../hdfs/server/datanode/DataStorage.java | 5 + .../hdfs/server/datanode/DirectoryScanner.java | 12 +- .../hdfs/server/datanode/LocalReplica.java | 179 +- .../server/datanode/LocalReplicaInPipeline.java | 30 +- .../hdfs/server/datanode/ReplicaInPipeline.java | 4 +- .../datanode/checker/DatasetVolumeChecker.java | 442 + .../server/datanode/fsdataset/FsDatasetSpi.java | 10 +- .../server/datanode/fsdataset/FsVolumeSpi.java | 12 +- .../datanode/fsdataset/ReplicaInputStreams.java | 102 +- .../fsdataset/ReplicaOutputStreams.java | 107 +- .../datanode/fsdataset/impl/BlockPoolSlice.java | 97 +- .../impl/FsDatasetAsyncDiskService.java | 7 +- .../datanode/fsdataset/impl/FsDatasetImpl.java | 5 +- .../datanode/fsdataset/impl/FsVolumeImpl.java | 20 +- .../namenode/ErasureCodingPolicyManager.java | 5 +- .../hadoop/hdfs/server/namenode/FSEditLog.java | 72 +- .../hadoop/hdfs/server/namenode/FSImage.java | 15 +- .../hdfs/server/namenode/FSNamesystem.java | 35 +- .../hdfs/server/namenode/NameNodeRpcServer.java | 2 +- .../server/namenode/ha/StandbyCheckpointer.java | 4 +- .../web/resources/NamenodeWebHdfsMethods.java | 39 +- .../hdfs/server/protocol/NamespaceInfo.java | 26 + .../org/apache/hadoop/hdfs/web/JsonUtil.java | 27 + .../hadoop-hdfs/src/main/proto/HdfsServer.proto | 2 + .../src/main/resources/hdfs-default.xml | 12 +- .../src/main/webapps/hdfs/dfshealth.html | 12 +- .../src/main/webapps/hdfs/dfshealth.js | 12 +- .../src/main/webapps/hdfs/explorer.html | 13 +- .../src/main/webapps/hdfs/explorer.js | 37 +- .../src/site/markdown/HDFSErasureCoding.md | 2 +- .../hadoop-hdfs/src/site/markdown/WebHDFS.md | 261 + .../TestDFSRSDefault10x4StripedInputStream.java | 35 + ...TestDFSRSDefault10x4StripedOutputStream.java | 36 + ...fault10x4StripedOutputStreamWithFailure.java | 36 + .../org/apache/hadoop/hdfs/TestFileAppend.java | 2 +- .../server/datanode/SimulatedFSDataset.java | 15 +- .../server/datanode/TestBPOfferService.java | 31 + .../hdfs/server/datanode/TestBlockRecovery.java | 2 +- .../server/datanode/TestDirectoryScanner.java | 18 +- .../server/datanode/TestSimulatedFSDataset.java | 2 +- .../checker/TestDatasetVolumeChecker.java | 261 + .../TestDatasetVolumeCheckerFailures.java | 193 + .../extdataset/ExternalDatasetImpl.java | 4 +- .../extdataset/ExternalReplicaInPipeline.java | 6 +- .../datanode/extdataset/ExternalVolumeImpl.java | 7 + .../namenode/TestAddStripedBlockInFBR.java | 34 +- .../hdfs/server/namenode/TestFSNamesystem.java | 21 + .../server/namenode/TestFSNamesystemMBean.java | 24 + .../namenode/metrics/TestNameNodeMetrics.java | 2 +- .../org/apache/hadoop/hdfs/web/TestWebHDFS.java | 68 + .../hadoop/hdfs/web/resources/TestParam.java | 8 + .../apache/hadoop/net/TestNetworkTopology.java | 29 +- .../hadoop/tools/TestHdfsConfigFields.java | 6 - .../hadoop/mapreduce/v2/app/MRAppMaster.java | 11 - .../mapreduce/v2/app/job/impl/TaskImpl.java | 1 + .../mapreduce/v2/app/webapp/AppController.java | 34 + .../mapreduce/v2/app/webapp/ConfBlock.java | 2 +- .../mapreduce/v2/app/webapp/TaskPage.java | 2 +- .../mapreduce/v2/app/webapp/TasksBlock.java | 2 +- .../mapreduce/v2/app/webapp/dao/JobInfo.java | 4 +- .../apache/hadoop/mapreduce/v2/app/MRApp.java | 14 - .../hadoop/mapreduce/v2/app/TestKill.java | 2 +- .../v2/app/webapp/TestAppController.java | 14 + .../hadoop-mapreduce-client-core/pom.xml | 16 + .../mapreduce/v2/hs/webapp/HsJobsBlock.java | 2 +- .../hadoop/mapreduce/v2/hs/webapp/HsWebApp.java | 2 + .../mapreduce/v2/hs/webapp/dao/JobInfo.java | 15 +- .../mapreduce/v2/hs/webapp/dao/TestJobInfo.java | 29 +- .../hadoop-mapreduce-client-nativetask/pom.xml | 2 - .../src/CMakeLists.txt | 8 +- .../src/main/native/gtest/gtest-all.cc | 10403 -------- .../src/main/native/gtest/include/gtest/gtest.h | 21192 ----------------- .../src/main/native/src/lib/Log.h | 2 +- hadoop-maven-plugins/pom.xml | 12 +- .../maven/plugin/protoc/ProtocRunner.java | 5 +- .../java/org/apache/hadoop/fs/s3a/S3AUtils.java | 23 + .../org/apache/hadoop/fs/s3a/Statistic.java | 4 +- .../hadoop/fs/s3native/NativeS3FileSystem.java | 7 +- .../fs/s3a/TestS3AExceptionTranslation.java | 38 + .../org/apache/hadoop/fs/adl/AdlFileSystem.java | 24 +- .../org/apache/hadoop/fs/adl/TestAdlRead.java | 6 +- .../apache/hadoop/fs/adl/TestListStatus.java | 6 +- .../fs/adl/live/TestAdlContractAppendLive.java | 11 +- .../fs/adl/live/TestAdlContractConcatLive.java | 23 +- .../fs/adl/live/TestAdlContractCreateLive.java | 19 +- .../fs/adl/live/TestAdlContractDeleteLive.java | 11 +- .../live/TestAdlContractGetFileStatusLive.java | 36 + .../fs/adl/live/TestAdlContractMkdirLive.java | 25 +- .../fs/adl/live/TestAdlContractOpenLive.java | 11 +- .../fs/adl/live/TestAdlContractRenameLive.java | 30 +- .../fs/adl/live/TestAdlContractRootDirLive.java | 19 +- .../fs/adl/live/TestAdlContractSeekLive.java | 11 +- .../live/TestAdlDifferentSizeWritesLive.java | 69 +- .../live/TestAdlFileContextCreateMkdirLive.java | 67 + .../TestAdlFileContextMainOperationsLive.java | 99 + .../adl/live/TestAdlFileSystemContractLive.java | 57 +- .../live/TestAdlInternalCreateNonRecursive.java | 134 + .../fs/adl/live/TestAdlPermissionLive.java | 116 + .../adl/live/TestAdlSupportedCharsetInPath.java | 334 + .../apache/hadoop/fs/adl/live/TestMetadata.java | 111 + .../fs/azure/AzureNativeFileSystemStore.java | 31 +- .../hadoop/fs/azure/NativeAzureFileSystem.java | 25 +- .../hadoop/fs/azure/NativeFileSystemStore.java | 23 +- ...estNativeAzureFileSystemConcurrencyLive.java | 119 + .../GetClusterNodeLabelsResponse.java | 50 +- .../yarn/api/records/ApplicationReport.java | 6 +- .../yarn/api/records/ContainerStatus.java | 40 +- .../hadoop/yarn/api/records/NodeReport.java | 12 +- .../src/main/proto/yarn_protos.proto | 7 +- .../yarn/conf/TestYarnConfigurationFields.java | 24 - .../yarn/client/api/impl/YarnClientImpl.java | 2 +- .../hadoop/yarn/client/cli/ApplicationCLI.java | 3 +- .../apache/hadoop/yarn/client/cli/LogsCLI.java | 2 +- .../hadoop/yarn/client/cli/RMAdminCLI.java | 2 +- .../hadoop/yarn/client/TestGetGroups.java | 36 +- .../hadoop/yarn/client/cli/TestYarnCLI.java | 7 +- .../pb/GetClusterNodeLabelsResponsePBImpl.java | 41 +- .../impl/pb/ApplicationReportPBImpl.java | 107 +- .../api/impl/FileSystemTimelineWriter.java | 5 +- .../client/api/impl/TimelineClientImpl.java | 2 +- .../yarn/security/ContainerTokenIdentifier.java | 25 + .../security/YarnAuthorizationProvider.java | 15 + .../state/InvalidStateTransitionException.java | 22 +- .../state/InvalidStateTransitonException.java | 19 +- .../org/apache/hadoop/yarn/util/FSDownload.java | 2 +- .../java/org/apache/hadoop/yarn/util/Times.java | 3 + .../org/apache/hadoop/yarn/webapp/Router.java | 23 +- .../org/apache/hadoop/yarn/webapp/WebApp.java | 13 + .../main/resources/yarn-version-info.properties | 2 +- .../client/impl/zk/RegistrySecurity.java | 2 +- ...pplicationHistoryManagerOnTimelineStore.java | 2 +- .../WindowsSecureContainerExecutor.java | 4 +- .../containermanager/AuxServices.java | 4 +- .../containermanager/ContainerManagerImpl.java | 2 +- .../localizer/ResourceLocalizationService.java | 2 +- .../logaggregation/AppLogAggregatorImpl.java | 2 +- .../server/resourcemanager/ClientRMService.java | 18 +- .../server/resourcemanager/RMAppManager.java | 110 +- .../resourcemanager/RMAppManagerEvent.java | 11 + .../resourcemanager/RMAppManagerEventType.java | 3 +- .../server/resourcemanager/RMContextImpl.java | 10 +- .../server/resourcemanager/RMServerUtils.java | 3 +- .../resourcemanager/rmapp/RMAppEventType.java | 1 - .../server/resourcemanager/rmapp/RMAppImpl.java | 61 +- .../resourcemanager/rmapp/RMAppMoveEvent.java | 44 - .../scheduler/AbstractYarnScheduler.java | 18 +- .../scheduler/SchedulerQueueManager.java | 75 + .../scheduler/YarnScheduler.java | 11 + .../scheduler/capacity/AbstractCSQueue.java | 35 +- .../scheduler/capacity/CSQueue.java | 10 + .../scheduler/capacity/CapacityScheduler.java | 321 +- .../CapacitySchedulerConfiguration.java | 22 +- .../capacity/CapacitySchedulerQueueManager.java | 361 + .../scheduler/capacity/LeafQueue.java | 19 +- .../scheduler/capacity/ParentQueue.java | 29 +- .../scheduler/fair/AllocationConfiguration.java | 38 +- .../fair/AllocationFileLoaderService.java | 68 +- .../resourcemanager/scheduler/fair/FSQueue.java | 22 +- .../scheduler/fair/FSQueueMetrics.java | 32 +- .../scheduler/fair/FairScheduler.java | 113 +- .../resourcemanager/webapp/RMWebServices.java | 10 +- .../resourcemanager/TestClientRMService.java | 4 +- .../resourcemanager/TestMoveApplication.java | 12 +- ...tyPreemptionPolicyForReservedContainers.java | 430 + .../rmapp/TestApplicationLifetimeMonitor.java | 15 +- .../capacity/TestApplicationLimits.java | 35 +- .../TestApplicationLimitsByPartition.java | 7 +- .../TestCapacitySchedulerNodeLabelUpdate.java | 1 + .../scheduler/capacity/TestChildQueueOrder.java | 9 +- .../scheduler/capacity/TestLeafQueue.java | 9 +- .../scheduler/capacity/TestParentQueue.java | 39 +- .../scheduler/capacity/TestQueueState.java | 96 + .../scheduler/capacity/TestReservations.java | 8 +- .../scheduler/capacity/TestUtils.java | 2 +- .../scheduler/fair/TestFSQueueMetrics.java | 69 + .../scheduler/fair/TestFairScheduler.java | 93 +- .../TestRMWebServicesAppsModification.java | 39 +- .../yarn/server/webproxy/ProxyUriUtils.java | 2 +- .../yarn/server/webproxy/WebAppProxy.java | 2 +- .../src/site/markdown/FairScheduler.md | 8 +- 247 files changed, 38744 insertions(+), 33142 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/881de1fb/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AUtils.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org