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 st...@apache.org on 2017/08/14 14:01:10 UTC
[26/26] hadoop git commit: Merge branch 'trunk' into HADOOP-13345
Merge branch 'trunk' into HADOOP-13345
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d0bca355
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d0bca355
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d0bca355
Branch: refs/heads/HADOOP-13345
Commit: d0bca3557f3655cb7613af2880d0b98bc8ec9598
Parents: e531ae2 d8f74c3
Author: Steve Loughran <st...@apache.org>
Authored: Mon Aug 14 14:44:20 2017 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Aug 14 14:44:20 2017 +0100
----------------------------------------------------------------------
.../org/apache/hadoop/conf/Configuration.java | 15 +-
.../key/kms/LoadBalancingKMSClientProvider.java | 4 +-
.../hadoop/fs/CommonConfigurationKeys.java | 21 +
.../java/org/apache/hadoop/fs/FileUtil.java | 4 +-
.../org/apache/hadoop/fs/ftp/FTPFileSystem.java | 4 +-
.../java/org/apache/hadoop/io/SequenceFile.java | 2 +-
.../hadoop/security/CompositeGroupsMapping.java | 4 +-
.../hadoop/util/curator/ZKCuratorManager.java | 294 ++++++++
.../hadoop/util/curator/package-info.java | 27 +
.../src/main/resources/core-default.xml | 95 ++-
.../conf/TestCommonConfigurationFields.java | 6 +
.../apache/hadoop/conf/TestConfiguration.java | 48 +-
.../apache/hadoop/fs/TestLocalFileSystem.java | 6 +-
.../util/curator/TestZKCuratorManager.java | 95 +++
.../org/apache/hadoop/hdfs/DFSInputStream.java | 11 +-
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 2 +-
.../server/blockmanagement/DatanodeManager.java | 2 -
.../hdfs/server/namenode/LeaseManager.java | 18 +-
.../src/main/resources/hdfs-default.xml | 2 +-
.../src/site/markdown/HdfsPermissionsGuide.md | 2 +-
.../java/org/apache/hadoop/cli/TestAclCLI.java | 2 +
.../java/org/apache/hadoop/hdfs/TestPread.java | 63 ++
.../hdfs/server/namenode/FSAclBaseTest.java | 8 +-
.../server/namenode/TestFSImageWithAcl.java | 14 +-
.../mapreduce/v2/app/job/impl/JobImpl.java | 35 +-
.../mapreduce/v2/app/job/impl/TestJobImpl.java | 139 +++-
.../apache/hadoop/mapreduce/MRJobConfig.java | 6 +-
.../src/main/resources/mapred-default.xml | 8 +
.../java/org/apache/hadoop/io/FileBench.java | 2 +-
.../mapred/MiniMRClientClusterFactory.java | 4 +-
.../mapred/TestCombineFileInputFormat.java | 6 +-
.../TestCombineSequenceFileInputFormat.java | 7 +-
.../mapred/TestCombineTextInputFormat.java | 7 +-
.../mapred/TestConcatenatedCompressedInput.java | 6 +-
.../org/apache/hadoop/mapred/TestMapRed.java | 4 +-
.../hadoop/mapred/TestMiniMRChildTask.java | 4 +-
.../hadoop/mapred/TestTextInputFormat.java | 8 +-
.../TestWrappedRecordReaderClassloader.java | 4 +-
.../lib/join/TestWrappedRRClassloader.java | 4 +-
.../mapreduce/util/MRAsyncDiskService.java | 2 +-
.../apache/hadoop/mapreduce/v2/TestMRJobs.java | 4 +-
.../v2/TestMRJobsWithHistoryService.java | 4 +-
.../hadoop/mapred/FadvisedFileRegion.java | 5 +-
.../org/apache/hadoop/tools/HadoopArchives.java | 2 +-
hadoop-tools/hadoop-azure-datalake/pom.xml | 2 +-
.../org/apache/hadoop/fs/adl/AdlConfKeys.java | 8 +
.../org/apache/hadoop/fs/adl/AdlFileSystem.java | 21 +
.../apache/hadoop/fs/adl/TokenProviderType.java | 2 +
.../src/site/markdown/index.md | 98 ++-
.../hadoop/fs/adl/TestAzureADTokenProvider.java | 40 +
.../services/org.apache.hadoop.fs.FileSystem | 17 -
.../apache/hadoop/mapred/gridmix/Gridmix.java | 2 +-
.../hadoop/mapred/gridmix/PseudoLocalFs.java | 8 +-
.../hadoop/mapred/gridmix/TestFilePool.java | 4 +-
.../hadoop/mapred/gridmix/TestFileQueue.java | 8 +-
.../mapred/gridmix/TestPseudoLocalFs.java | 2 +-
.../hadoop/mapred/gridmix/TestUserResolve.java | 4 +-
.../hadoop/fs/swift/util/SwiftTestUtils.java | 2 +-
.../fs/swift/SwiftFileSystemBaseTest.java | 2 +-
.../TestSwiftFileSystemPartitionedUploads.java | 4 +-
.../hadoop/tools/rumen/TestHistograms.java | 6 +-
.../org/apache/hadoop/streaming/StreamJob.java | 27 +-
.../hadoop/yarn/conf/YarnConfiguration.java | 23 +-
.../yarn/conf/TestYarnConfigurationFields.java | 11 +
.../src/main/resources/yarn-default.xml | 53 --
.../hadoop-yarn-server-nodemanager/pom.xml | 38 +
.../src/CMakeLists.txt | 22 +
.../container-executor/impl/configuration.c | 672 ++++++++++++-----
.../container-executor/impl/configuration.h | 182 +++--
.../impl/container-executor.c | 39 +-
.../impl/container-executor.h | 52 +-
.../container-executor/impl/get_executable.c | 1 +
.../main/native/container-executor/impl/main.c | 17 +-
.../main/native/container-executor/impl/util.c | 134 ++++
.../main/native/container-executor/impl/util.h | 115 +++
.../test-configurations/configuration-1.cfg | 31 +
.../test-configurations/configuration-2.cfg | 28 +
.../test/test-configurations/old-config.cfg | 25 +
.../test/test-container-executor.c | 15 +-
.../test/test_configuration.cc | 432 +++++++++++
.../native/container-executor/test/test_main.cc | 29 +
.../native/container-executor/test/test_util.cc | 138 ++++
.../BaseContainerManagerTest.java | 10 +-
...ActiveStandbyElectorBasedElectorService.java | 5 +-
.../yarn/server/resourcemanager/RMZKUtils.java | 81 --
.../server/resourcemanager/ResourceManager.java | 92 ++-
.../monitor/SchedulingEditPolicy.java | 4 +-
.../monitor/SchedulingMonitor.java | 4 +-
.../ProportionalCapacityPreemptionPolicy.java | 4 +-
.../monitor/invariants/InvariantsChecker.java | 10 +-
.../invariants/MetricsInvariantChecker.java | 7 +-
.../recovery/ZKRMStateStore.java | 38 +-
.../reservation/ReservationInputValidator.java | 18 +-
.../rmapp/attempt/RMAppAttemptImpl.java | 16 +-
.../capacity/CapacitySchedulerQueueManager.java | 4 +
.../scheduler/capacity/ParentQueue.java | 39 +-
.../fair/AllocationFileLoaderService.java | 10 +-
.../server/resourcemanager/RMHATestBase.java | 5 +-
.../TestReservationInputValidator.java | 93 +++
.../capacity/TestCapacityScheduler.java | 114 ++-
.../webapp/DefaultRequestInterceptorREST.java | 16 +-
.../webapp/FederationInterceptorREST.java | 750 +++++++++++++++++++
.../webapp/BaseRouterWebServicesTest.java | 37 +-
.../MockDefaultRequestInterceptorREST.java | 136 ++++
.../webapp/TestFederationInterceptorREST.java | 379 ++++++++++
.../TestFederationInterceptorRESTRetry.java | 274 +++++++
.../TestableFederationInterceptorREST.java | 54 ++
.../src/site/markdown/Federation.md | 2 +-
.../src/main/webapp/app/initializers/loader.js | 42 +-
109 files changed, 4775 insertions(+), 793 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d0bca355/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org