Merge branch 'trunk' into HDFS-1312
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/82b1bd57 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/82b1bd57 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/82b1bd57 Branch: refs/heads/HDFS-1312 Commit: 82b1bd57e5df78437909d007e34c95d5d1d9c293 Parents: f9fa013 1f2794b Author: Anu Engineer <aengin...@apache.org> Authored: Fri May 13 10:56:02 2016 -0700 Committer: Anu Engineer <aengin...@apache.org> Committed: Fri May 13 10:56:02 2016 -0700 ---------------------------------------------------------------------- hadoop-assemblies/pom.xml | 4 +- hadoop-build-tools/pom.xml | 2 +- hadoop-client/pom.xml | 4 +- .../hadoop-annotations/pom.xml | 4 +- .../hadoop-auth-examples/pom.xml | 4 +- hadoop-common-project/hadoop-auth/pom.xml | 4 +- .../authentication/util/KerberosName.java | 9 +- .../TestKerberosAuthenticationHandler.java | 7 +- .../authentication/util/TestKerberosName.java | 17 +- hadoop-common-project/hadoop-common/pom.xml | 4 +- .../org/apache/hadoop/conf/Configuration.java | 21 + .../hadoop/crypto/key/JavaKeyStoreProvider.java | 90 +++- .../apache/hadoop/crypto/key/KeyProvider.java | 32 ++ .../org/apache/hadoop/crypto/key/KeyShell.java | 128 ++--- .../hadoop/fs/EmptyStorageStatistics.java | 43 ++ .../org/apache/hadoop/fs/FSDataInputStream.java | 9 + .../java/org/apache/hadoop/fs/FileSystem.java | 47 +- .../hadoop/fs/FileSystemStorageStatistics.java | 136 ++++++ .../main/java/org/apache/hadoop/fs/FsShell.java | 15 +- .../hadoop/fs/GlobalStorageStatistics.java | 127 +++++ .../org/apache/hadoop/fs/StorageStatistics.java | 93 ++++ .../hadoop/fs/UnionStorageStatistics.java | 113 +++++ .../org/apache/hadoop/io/DataInputBuffer.java | 81 +++- .../main/java/org/apache/hadoop/io/IOUtils.java | 4 +- .../hadoop/metrics2/MetricStringBuilder.java | 141 ++++++ .../hadoop/metrics2/lib/MutableCounterLong.java | 2 +- .../java/org/apache/hadoop/security/KDiag.java | 46 +- .../hadoop/security/ShellBasedIdMapping.java | 21 +- .../alias/AbstractJavaKeyStoreProvider.java | 150 ++++-- .../security/alias/CredentialProvider.java | 37 +- .../hadoop/security/alias/CredentialShell.java | 168 ++++--- .../security/alias/JavaKeyStoreProvider.java | 6 +- .../alias/LocalJavaKeyStoreProvider.java | 4 +- .../security/http/RestCsrfPreventionFilter.java | 12 +- .../security/http/XFrameOptionsFilter.java | 167 +++++++ .../hadoop/security/http/package-info.java | 22 + .../org/apache/hadoop/security/token/Token.java | 2 +- .../org/apache/hadoop/util/SysInfoLinux.java | 39 +- .../src/main/resources/core-default.xml | 43 +- .../src/site/markdown/CommandsManual.md | 18 +- .../src/site/markdown/FileSystemShell.md | 5 + .../src/site/markdown/SecureMode.md | 6 + .../crypto/key/TestKeyProviderFactory.java | 2 +- .../apache/hadoop/crypto/key/TestKeyShell.java | 32 +- .../apache/hadoop/fs/TestFilterFileSystem.java | 1 + .../org/apache/hadoop/fs/TestHarFileSystem.java | 1 + .../fs/contract/AbstractBondedFSContract.java | 3 +- .../org/apache/hadoop/security/TestKDiag.java | 16 + .../security/TestUserGroupInformation.java | 27 +- .../hadoop/security/alias/TestCredShell.java | 55 ++- .../alias/TestCredentialProviderFactory.java | 5 +- .../http/TestRestCsrfPreventionFilter.java | 40 +- .../security/http/TestXFrameOptionsFilter.java | 151 ++++++ .../java/org/apache/hadoop/util/JarFinder.java | 26 +- .../java/org/apache/hadoop/util/TestRunJar.java | 29 +- .../apache/hadoop/util/TestSysInfoLinux.java | 92 +++- hadoop-common-project/hadoop-kms/pom.xml | 4 +- hadoop-common-project/hadoop-minikdc/pom.xml | 4 +- hadoop-common-project/hadoop-nfs/pom.xml | 4 +- hadoop-common-project/pom.xml | 4 +- hadoop-dist/pom.xml | 4 +- hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 4 +- .../hadoop/hdfs/AsyncDistributedFileSystem.java | 59 +++ .../hadoop/hdfs/DFSOpsCountStatistics.java | 167 +++++++ .../hadoop/hdfs/DistributedFileSystem.java | 81 +++- .../hadoop/hdfs/protocol/DatanodeInfo.java | 59 ++- .../ClientNamenodeProtocolTranslatorPB.java | 39 +- .../hadoop/hdfs/protocolPB/PBHelperClient.java | 8 + .../hadoop/hdfs/web/WebHdfsFileSystem.java | 51 ++ .../src/main/proto/hdfs.proto | 2 + hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 4 +- .../hadoop-hdfs-native-client/pom.xml | 4 +- hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 4 +- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 4 +- .../hadoop-hdfs/src/contrib/bkjournal/pom.xml | 4 +- .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 4 +- .../CacheReplicationMonitor.java | 2 +- .../hadoop/hdfs/tools/erasurecode/ECCli.java | 14 +- .../apache/hadoop/hdfs/TestAsyncDFSRename.java | 267 +++++++++- .../apache/hadoop/hdfs/TestDFSPermission.java | 29 +- .../hadoop/hdfs/TestDistributedFileSystem.java | 170 ++++++- .../fsdataset/impl/TestFsDatasetImpl.java | 2 +- .../server/namenode/TestNameNodeMXBean.java | 24 +- .../test/resources/testErasureCodingConf.xml | 16 + hadoop-hdfs-project/pom.xml | 4 +- .../hadoop-mapreduce-client-app/pom.xml | 4 +- .../hadoop-mapreduce-client-common/pom.xml | 4 +- .../hadoop-mapreduce-client-core/pom.xml | 4 +- .../hadoop/mapred/LocatedFileStatusFetcher.java | 4 +- .../lib/input/CompressedSplitLineReader.java | 5 + .../hadoop/mapred/TestLineRecordReader.java | 29 ++ .../lib/input/TestLineRecordReader.java | 29 ++ .../compressedMultibyteDelimiter.txt.bz2 | Bin 0 -> 1096 bytes .../hadoop-mapreduce-client-hs-plugins/pom.xml | 4 +- .../hadoop-mapreduce-client-hs/pom.xml | 4 +- .../mapreduce/v2/hs/HistoryFileManager.java | 37 +- ...estUnnecessaryBlockingOnHistoryFileInfo.java | 323 +++++++++++++ .../hadoop-mapreduce-client-jobclient/pom.xml | 4 +- .../hadoop-mapreduce-client-nativetask/pom.xml | 4 +- .../hadoop-mapreduce-client-shuffle/pom.xml | 4 +- .../hadoop/mapred/FadvisedFileRegion.java | 2 +- .../hadoop-mapreduce-client/pom.xml | 4 +- .../hadoop-mapreduce-examples/pom.xml | 4 +- hadoop-mapreduce-project/pom.xml | 4 +- hadoop-maven-plugins/pom.xml | 2 +- hadoop-minicluster/pom.xml | 4 +- hadoop-project-dist/pom.xml | 4 +- hadoop-project/pom.xml | 4 +- hadoop-tools/hadoop-ant/pom.xml | 4 +- hadoop-tools/hadoop-archive-logs/pom.xml | 4 +- hadoop-tools/hadoop-archives/pom.xml | 4 +- .../hadoop-aws/dev-support/findbugs-exclude.xml | 357 +------------- hadoop-tools/hadoop-aws/pom.xml | 120 ++++- .../apache/hadoop/fs/s3/FileSystemStore.java | 4 +- .../org/apache/hadoop/fs/s3/S3Credentials.java | 2 + .../fs/s3a/AnonymousAWSCredentialsProvider.java | 4 + .../fs/s3a/BasicAWSCredentialsProvider.java | 4 + .../org/apache/hadoop/fs/s3a/Constants.java | 20 +- .../hadoop/fs/s3a/S3AFastOutputStream.java | 11 +- .../org/apache/hadoop/fs/s3a/S3AFileStatus.java | 12 +- .../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 482 +++++++++++-------- .../apache/hadoop/fs/s3a/S3AInputStream.java | 342 +++++++++---- .../hadoop/fs/s3a/S3AInstrumentation.java | 457 ++++++++++++++++++ .../apache/hadoop/fs/s3a/S3AOutputStream.java | 40 +- .../src/site/markdown/tools/hadoop-aws/index.md | 167 ++++++- .../hadoop/fs/contract/s3/S3Contract.java | 10 + .../fs/contract/s3/TestS3ContractRootDir.java | 15 + .../fs/contract/s3/TestS3ContractSeek.java | 9 + .../hadoop/fs/contract/s3a/S3AContract.java | 9 +- .../fs/contract/s3a/TestS3AContractRootDir.java | 39 +- .../fs/contract/s3n/NativeS3Contract.java | 9 +- .../apache/hadoop/fs/s3/TestS3Credentials.java | 3 + .../hadoop/fs/s3a/TestS3AConfiguration.java | 71 ++- .../hadoop/fs/s3a/scale/S3AScaleTestBase.java | 195 +++++++- .../fs/s3a/scale/TestS3ADeleteManyFiles.java | 1 - .../scale/TestS3AInputStreamPerformance.java | 285 +++++++++++ .../Jets3tNativeS3FileSystemContractTest.java | 30 -- .../TestJets3tNativeS3FileSystemContract.java | 30 ++ .../src/test/resources/log4j.properties | 3 + hadoop-tools/hadoop-azure/pom.xml | 2 +- hadoop-tools/hadoop-datajoin/pom.xml | 4 +- hadoop-tools/hadoop-distcp/pom.xml | 4 +- hadoop-tools/hadoop-extras/pom.xml | 4 +- hadoop-tools/hadoop-gridmix/pom.xml | 4 +- hadoop-tools/hadoop-kafka/pom.xml | 4 +- hadoop-tools/hadoop-openstack/pom.xml | 26 +- hadoop-tools/hadoop-pipes/pom.xml | 4 +- hadoop-tools/hadoop-rumen/pom.xml | 4 +- hadoop-tools/hadoop-sls/pom.xml | 4 +- .../org/apache/hadoop/yarn/sls/SLSRunner.java | 18 +- hadoop-tools/hadoop-streaming/pom.xml | 4 +- hadoop-tools/hadoop-tools-dist/pom.xml | 4 +- hadoop-tools/pom.xml | 4 +- .../hadoop-yarn/hadoop-yarn-api/pom.xml | 4 +- .../hadoop/yarn/api/ApplicationConstants.java | 7 + .../hadoop/yarn/conf/YarnConfiguration.java | 10 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../hadoop-yarn-applications/pom.xml | 4 +- .../hadoop-yarn/hadoop-yarn-client/pom.xml | 4 +- .../apache/hadoop/yarn/client/cli/LogsCLI.java | 55 ++- .../hadoop/yarn/client/cli/TestLogsCLI.java | 203 ++++++-- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 4 +- .../yarn/logaggregation/LogCLIHelpers.java | 82 +++- .../hadoop-yarn/hadoop-yarn-registry/pom.xml | 4 +- .../pom.xml | 4 +- ...pplicationHistoryManagerOnTimelineStore.java | 11 + .../webapp/AHSWebServices.java | 6 +- .../hadoop-yarn-server-common/pom.xml | 4 +- .../metrics/ApplicationMetricsConstants.java | 3 + .../hadoop-yarn-server-nodemanager/pom.xml | 4 +- .../containermanager/AuxServices.java | 43 +- .../AuxiliaryServiceWithCustomClassLoader.java | 201 ++++++++ .../containermanager/ContainerManagerImpl.java | 31 +- .../queuing/QueuingContainerManagerImpl.java | 57 ++- .../recovery/NMLeveldbStateStoreService.java | 26 +- .../recovery/NMNullStateStoreService.java | 4 + .../recovery/NMStateStoreService.java | 9 + .../containermanager/TestAuxServices.java | 119 ++++- .../recovery/NMMemoryStateStoreService.java | 6 + .../TestNMLeveldbStateStoreService.java | 12 + .../hadoop-yarn-server-resourcemanager/pom.xml | 4 +- .../server/resourcemanager/ClientRMService.java | 7 +- .../resourcemanager/amlauncher/AMLauncher.java | 14 + .../metrics/ApplicaitonStateUpdatedEvent.java | 47 ++ .../metrics/SystemMetricsEventType.java | 1 + .../metrics/SystemMetricsPublisher.java | 89 ++-- .../server/resourcemanager/rmapp/RMAppImpl.java | 19 +- .../webapp/FairSchedulerPage.java | 1 + .../webapp/dao/FairSchedulerQueueInfo.java | 9 + .../TestApplicationMasterLauncher.java | 5 + .../metrics/TestSystemMetricsPublisher.java | 29 +- .../pom.xml | 4 +- .../hadoop-yarn-server-tests/pom.xml | 4 +- .../pom.xml | 4 +- .../hadoop-yarn-server-web-proxy/pom.xml | 4 +- .../hadoop-yarn/hadoop-yarn-server/pom.xml | 4 +- .../hadoop-yarn/hadoop-yarn-site/pom.xml | 4 +- hadoop-yarn-project/hadoop-yarn/pom.xml | 4 +- hadoop-yarn-project/pom.xml | 4 +- pom.xml | 2 +- 201 files changed, 6462 insertions(+), 1451 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/82b1bd57/hadoop-hdfs-project/hadoop-hdfs/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/82b1bd57/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
