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 2016/06/22 00:39:16 UTC
[17/17] hadoop git commit: Merge branch 'trunk' into HDFS-1312
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/62e4dcd2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/62e4dcd2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/62e4dcd2
Branch: refs/heads/HDFS-1312
Commit: 62e4dcd2d63ab3bce0b2fd942ebba1dd82693733
Parents: 90a0326 d8107fc
Author: Anu Engineer <ae...@apache.org>
Authored: Tue Jun 21 17:38:45 2016 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Tue Jun 21 17:38:45 2016 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/pom.xml | 5 +
.../hadoop/fs/FileSystemStorageStatistics.java | 10 +-
.../main/java/org/apache/hadoop/fs/Path.java | 181 ++++++--
.../fs/TestFileSystemStorageStatistics.java | 134 ++++++
.../hadoop/hdfs/AsyncDistributedFileSystem.java | 213 ---------
.../hadoop/hdfs/DFSOpsCountStatistics.java | 5 +-
.../hadoop/hdfs/DistributedFileSystem.java | 10 -
.../hadoop/hdfs/protocol/CachePoolInfo.java | 25 +
.../hadoop/hdfs/protocolPB/PBHelperClient.java | 7 +
.../src/main/proto/ClientNamenodeProtocol.proto | 1 +
.../hadoop/hdfs/TestDFSOpsCountStatistics.java | 108 +++++
.../src/main/conf/httpfs-env.sh | 4 +
.../src/main/libexec/httpfs-config.sh | 1 +
.../src/main/tomcat/server.xml | 1 +
.../src/main/tomcat/ssl-server.xml.conf | 1 +
.../src/site/markdown/ServerSetup.md.vm | 4 +
.../server/datanode/DataNodeFaultInjector.java | 2 +
.../hdfs/server/datanode/DataXceiver.java | 3 +
.../datanode/fsdataset/impl/FsDatasetImpl.java | 4 +
.../hdfs/server/namenode/CacheManager.java | 19 +-
.../hadoop/hdfs/server/namenode/CachePool.java | 28 +-
.../server/namenode/FSImageSerialization.java | 16 +-
.../apache/hadoop/hdfs/tools/CacheAdmin.java | 34 +-
.../org/apache/hadoop/hdfs/TestAsyncDFS.java | 454 -------------------
.../apache/hadoop/hdfs/TestAsyncDFSRename.java | 187 --------
.../apache/hadoop/hdfs/TestAsyncHDFSWithHA.java | 181 --------
.../fsdataset/impl/TestSpaceReservation.java | 48 ++
.../src/test/resources/testCacheAdminConf.xml | 51 ++-
.../v2/app/webapp/TestAMWebServices.java | 29 +-
.../v2/app/webapp/TestAMWebServicesAttempt.java | 20 +-
.../app/webapp/TestAMWebServicesAttempts.java | 24 +-
.../v2/app/webapp/TestAMWebServicesJobConf.java | 27 +-
.../v2/app/webapp/TestAMWebServicesJobs.java | 31 +-
.../v2/app/webapp/TestAMWebServicesTasks.java | 32 +-
.../apache/hadoop/mapreduce/v2/util/MRApps.java | 70 ++-
.../java/org/apache/hadoop/mapreduce/Job.java | 7 +-
.../hadoop/mapreduce/JobResourceUploader.java | 20 +-
.../hadoop/mapreduce/JobSubmissionFiles.java | 4 +-
.../apache/hadoop/mapreduce/JobSubmitter.java | 6 +-
.../ClientDistributedCacheManager.java | 31 +-
.../mapreduce/filecache/DistributedCache.java | 76 +++-
.../src/main/resources/mapred-default.xml | 18 +
.../TestClientDistributedCacheManager.java | 151 +++++-
.../filecache/TestDistributedCache.java | 132 ++++++
.../v2/hs/webapp/TestHsWebServices.java | 28 +-
.../v2/hs/webapp/TestHsWebServicesAttempts.java | 33 +-
.../v2/hs/webapp/TestHsWebServicesJobConf.java | 20 +-
.../v2/hs/webapp/TestHsWebServicesJobs.java | 35 +-
.../hs/webapp/TestHsWebServicesJobsQuery.java | 60 +--
.../v2/hs/webapp/TestHsWebServicesTasks.java | 32 +-
.../hadoop/mapred/TestLocalJobSubmission.java | 34 +-
.../apache/hadoop/mapreduce/v2/TestMRJobs.java | 48 +-
.../apache/hadoop/mapred/ShuffleHandler.java | 193 ++++++--
.../hadoop/mapred/TestShuffleHandler.java | 16 +-
hadoop-project/pom.xml | 19 +-
.../hadoop/fs/s3a/S3AStorageStatistics.java | 5 +-
.../hadoop/fs/s3a/TestS3ACredentialsInURL.java | 16 +-
.../apache/hadoop/yarn/client/cli/LogsCLI.java | 3 +-
.../hadoop-yarn/hadoop-yarn-common/pom.xml | 6 +
.../yarn/client/api/impl/TimelineWriter.java | 3 +-
.../client/api/impl/TestTimelineClient.java | 4 +-
.../api/impl/TestTimelineClientForATS1_5.java | 4 +-
.../hadoop/yarn/webapp/GuiceServletConfig.java | 43 ++
.../yarn/webapp/WebServicesTestUtils.java | 11 +
.../webapp/TestAHSWebServices.java | 64 ++-
.../webapp/TestTimelineWebServices.java | 56 ++-
.../server/nodemanager/ContainerExecutor.java | 15 +-
.../nodemanager/webapp/TestNMWebServices.java | 29 +-
.../webapp/TestNMWebServicesApps.java | 42 +-
.../webapp/TestNMWebServicesContainers.java | 29 +-
.../webapp/TestRMWebServices.java | 29 +-
.../webapp/TestRMWebServicesApps.java | 51 ++-
.../TestRMWebServicesAppsModification.java | 89 ++--
.../webapp/TestRMWebServicesCapacitySched.java | 65 ++-
.../TestRMWebServicesDelegationTokens.java | 66 ++-
.../webapp/TestRMWebServicesFairScheduler.java | 29 +-
.../TestRMWebServicesForCSWithPartitions.java | 92 ++--
.../webapp/TestRMWebServicesNodeLabels.java | 30 +-
.../webapp/TestRMWebServicesNodes.java | 35 +-
.../webapp/TestRMWebServicesReservation.java | 139 +++---
.../yarn/webapp/TestRMWithCSRFFilter.java | 22 +-
.../hadoop/yarn/webapp/TestRMWithXFSFilter.java | 19 +-
82 files changed, 2015 insertions(+), 1914 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/62e4dcd2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org