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 sh...@apache.org on 2018/06/29 22:52:38 UTC
[31/32] 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/f37c0a89
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f37c0a89
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f37c0a89
Branch: refs/heads/HDFS-12943
Commit: f37c0a8969a0a73daad01bc52c6ae1070c745fd9
Parents: 8310973 cdb0844
Author: Konstantin V Shvachko <sh...@apache.org>
Authored: Fri Jun 29 15:36:55 2018 -0700
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Fri Jun 29 15:36:55 2018 -0700
----------------------------------------------------------------------
NOTICE.txt | 8 +
.../hadoop-client-minicluster/pom.xml | 8 -
hadoop-common-project/hadoop-common/pom.xml | 5 -
.../hadoop/conf/ReconfigurationServlet.java | 42 +--
.../apache/hadoop/crypto/key/KeyProvider.java | 4 +-
.../org/apache/hadoop/crypto/key/KeyShell.java | 2 +-
.../main/java/org/apache/hadoop/fs/FsShell.java | 3 +-
.../org/apache/hadoop/fs/LocalDirAllocator.java | 7 +-
.../main/java/org/apache/hadoop/fs/Path.java | 2 +-
.../java/org/apache/hadoop/fs/shell/Count.java | 2 +-
.../apache/hadoop/ha/ActiveStandbyElector.java | 5 +-
.../apache/hadoop/ha/ZKFailoverController.java | 2 +-
.../apache/hadoop/io/ElasticByteBufferPool.java | 2 +-
.../apache/hadoop/io/FastByteComparisons.java | 44 +--
.../apache/hadoop/io/erasurecode/ECSchema.java | 4 +-
.../io/erasurecode/ErasureCodeNative.java | 2 +-
.../nativeio/SharedFileDescriptorFactory.java | 2 +-
.../org/apache/hadoop/ipc/CallerContext.java | 4 +-
.../apache/hadoop/ipc/DecayRpcScheduler.java | 4 +-
.../org/apache/hadoop/ipc/FairCallQueue.java | 4 +-
.../hadoop/metrics2/MetricsJsonBuilder.java | 2 +-
.../hadoop/metrics2/lib/MethodMetric.java | 2 +-
.../metrics2/lib/MutableMetricsFactory.java | 2 +-
.../hadoop/metrics2/lib/MutableQuantiles.java | 2 +-
.../metrics2/lib/MutableRollingAverages.java | 2 +-
.../apache/hadoop/metrics2/lib/MutableStat.java | 2 +-
.../metrics2/sink/RollingFileSystemSink.java | 2 +-
.../org/apache/hadoop/net/TableMapping.java | 2 +-
.../apache/hadoop/net/unix/DomainSocket.java | 2 +-
.../hadoop/net/unix/DomainSocketWatcher.java | 2 +-
.../security/ShellBasedUnixGroupsMapping.java | 2 +-
.../hadoop/security/alias/CredentialShell.java | 2 +-
.../hadoop/security/http/CrossOriginFilter.java | 2 +-
.../hadoop/security/token/DtFileOperations.java | 2 +-
.../org/apache/hadoop/tools/TableListing.java | 6 +-
.../org/apache/hadoop/util/StringUtils.java | 64 +++-
.../apache/hadoop/conf/TestConfiguration.java | 2 +-
.../conf/TestConfigurationFieldsBase.java | 2 +-
.../crypto/random/TestOsSecureRandom.java | 2 +-
.../org/apache/hadoop/fs/FSTestWrapper.java | 2 +-
.../apache/hadoop/fs/FileContextTestHelper.java | 1 -
.../hadoop/fs/TestDFCachingGetSpaceUsed.java | 2 +-
.../fs/TestFileSystemStorageStatistics.java | 18 +-
.../apache/hadoop/fs/TestLocalDirAllocator.java | 59 ++++
.../hadoop/fs/shell/TestCopyFromLocal.java | 10 +-
.../TestSharedFileDescriptorFactory.java | 2 +-
.../org/apache/hadoop/ipc/TestProtoBufRpc.java | 2 +-
.../java/org/apache/hadoop/ipc/TestSaslRPC.java | 2 +-
.../org/apache/hadoop/net/TestNetUtils.java | 2 +-
.../hadoop/net/unix/TestDomainSocket.java | 2 +-
...tionTokenAuthenticationHandlerWithMocks.java | 2 +-
.../AbstractServiceLauncherTestBase.java | 2 +-
.../apache/hadoop/test/GenericTestUtils.java | 4 +-
.../hadoop/util/TestShutdownHookManager.java | 2 +-
.../apache/hadoop/util/TestSignalLogger.java | 2 +-
.../src/main/compose/ozone/docker-compose.yaml | 12 -
.../src/main/compose/ozone/docker-config | 5 -
.../main/compose/ozoneperf/docker-compose.yaml | 13 -
.../src/main/compose/ozoneperf/docker-config | 5 -
.../apache/hadoop/hdds/scm/ScmConfigKeys.java | 26 --
.../org/apache/hadoop/ozone/OzoneConsts.java | 1 -
.../apache/hadoop/utils/BackgroundService.java | 2 +-
.../common/src/main/resources/ozone-default.xml | 47 ---
.../hadoop/ozone/HddsDatanodeService.java | 13 +-
.../common/impl/ContainerManagerImpl.java | 7 +-
.../common/interfaces/ContainerManager.java | 2 +
.../background/BlockDeletingService.java | 8 +-
.../DeleteBlocksCommandHandler.java | 29 +-
.../container/ozoneimpl/OzoneContainer.java | 2 +-
.../container/replication/ReplicationQueue.java | 76 +++++
.../replication/ReplicationRequest.java | 106 ++++++
.../container/replication/package-info.java | 23 ++
.../replication/TestReplicationQueue.java | 134 ++++++++
.../container/replication/package-info.java | 23 ++
.../testutils/BlockDeletingServiceTestImpl.java | 4 +-
.../hadoop/hdds/server/events/EventWatcher.java | 157 +++++++++
.../server/events/IdentifiableEventPayload.java | 30 ++
.../hdds/server/events/EventHandlerStub.java | 38 +++
.../hdds/server/events/TestEventWatcher.java | 220 ++++++++++++
.../hdds/scm/container/ContainerMapping.java | 10 +-
.../replication/ContainerSupervisor.java | 340 -------------------
.../container/replication/InProgressPool.java | 255 --------------
.../scm/container/replication/PeriodicPool.java | 119 -------
.../scm/container/replication/package-info.java | 23 --
.../hadoop/hdds/scm/node/NodeManager.java | 6 -
.../hadoop/hdds/scm/node/NodePoolManager.java | 71 ----
.../hadoop/hdds/scm/node/SCMNodeManager.java | 23 --
.../hdds/scm/node/SCMNodePoolManager.java | 269 ---------------
.../server/SCMDatanodeHeartbeatDispatcher.java | 126 +++++++
.../scm/server/SCMDatanodeProtocolServer.java | 14 +-
.../scm/server/StorageContainerManager.java | 4 +-
.../SCMDatanodeContainerReportHandler.java | 76 -----
.../report/SCMDatanodeHeartbeatDispatcher.java | 189 -----------
.../report/SCMDatanodeNodeReportHandler.java | 43 ---
.../server/report/SCMDatanodeReportHandler.java | 83 -----
.../report/SCMDatanodeReportHandlerFactory.java | 82 -----
.../hdds/scm/server/report/package-info.java | 57 ----
.../hdds/scm/container/MockNodeManager.java | 6 -
.../hdds/scm/node/TestSCMNodePoolManager.java | 160 ---------
.../TestSCMDatanodeHeartbeatDispatcher.java | 119 +++++++
.../TestSCMDatanodeContainerReportHandler.java | 34 --
.../TestSCMDatanodeHeartbeatDispatcher.java | 138 --------
.../TestSCMDatanodeNodeReportHandler.java | 36 --
.../TestSCMDatanodeReportHandlerFactory.java | 51 ---
.../hdds/scm/server/report/package-info.java | 21 --
.../testutils/ReplicationNodeManagerMock.java | 5 -
.../ReplicationNodePoolManagerMock.java | 133 --------
.../impl/TextFileRegionAliasMap.java | 5 +-
.../hdfs/server/namenode/FSNamesystemLock.java | 2 +-
.../test/acceptance/basic/docker-compose.yaml | 12 -
.../src/test/acceptance/basic/docker-config | 5 -
.../src/test/acceptance/commonlib.robot | 1 -
.../test/acceptance/ozonefs/docker-compose.yaml | 12 -
.../src/test/acceptance/ozonefs/docker-config | 5 -
hadoop-ozone/common/src/main/bin/ozone | 9 +-
.../common/TestBlockDeletingService.java | 11 +-
.../commandhandler/TestBlockDeletion.java | 211 ++++++++++++
.../TestCloseContainerByPipeline.java | 65 +++-
.../hadoop/ozone/scm/TestContainerSQLCli.java | 31 --
.../apache/hadoop/ozone/scm/TestSCMMetrics.java | 253 --------------
.../org/apache/hadoop/ozone/scm/cli/SQLCLI.java | 74 ----
hadoop-project/pom.xml | 5 -
.../aliyun/oss/AliyunCredentialsProvider.java | 2 +-
.../fs/aliyun/oss/AliyunOSSFileSystem.java | 2 +-
.../fs/aliyun/oss/AliyunOSSFileSystemStore.java | 2 +-
.../hadoop/fs/aliyun/oss/AliyunOSSUtils.java | 2 +-
.../fs/aliyun/oss/AliyunOSSTestUtils.java | 2 +-
.../fs/s3a/AWSCredentialProviderList.java | 2 +-
.../fs/s3a/BasicAWSCredentialsProvider.java | 2 +-
.../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 4 +-
.../apache/hadoop/fs/s3a/S3AInputStream.java | 2 +-
.../java/org/apache/hadoop/fs/s3a/S3AUtils.java | 2 +-
.../fs/s3a/SimpleAWSCredentialsProvider.java | 2 +-
.../fs/s3a/TemporaryAWSCredentialsProvider.java | 2 +-
.../s3a/auth/AssumedRoleCredentialProvider.java | 2 +-
.../s3a/commit/files/SinglePendingCommit.java | 2 +-
.../hadoop/fs/s3a/commit/files/SuccessData.java | 2 +-
.../fs/s3a/commit/magic/MagicCommitTracker.java | 2 +-
.../hadoop/fs/s3a/commit/staging/Paths.java | 2 +-
.../fs/s3a/s3guard/DynamoDBClientFactory.java | 2 +-
.../fs/s3a/s3guard/DynamoDBMetadataStore.java | 2 +-
.../fs/s3a/s3guard/LocalMetadataStore.java | 2 +-
.../hadoop/fs/s3a/s3guard/S3GuardTool.java | 2 +-
.../hadoop/fs/s3native/S3xLoginHelper.java | 4 +-
.../hadoop/fs/s3a/ITestS3AConfiguration.java | 4 +-
.../ITestS3AEncryptionSSEKMSUserDefinedKey.java | 2 +-
...onSSEKMSUserDefinedKeyBlockOutputStream.java | 2 +-
.../org/apache/hadoop/fs/s3a/S3ATestUtils.java | 2 +-
.../fs/s3a/commit/AbstractCommitITest.java | 2 +-
.../org/apache/hadoop/fs/adl/AdlFileSystem.java | 2 +-
.../hadoop/fs/adl/TestAzureADTokenProvider.java | 2 +-
.../fs/azure/AzureNativeFileSystemStore.java | 2 +-
.../hadoop/fs/azure/BlockBlobAppendStream.java | 2 +-
.../fs/azure/ClientThrottlingAnalyzer.java | 2 +-
.../hadoop/fs/azure/NativeAzureFileSystem.java | 2 +-
.../hadoop/fs/azure/PageBlobOutputStream.java | 2 +-
.../fs/azure/RemoteWasbAuthorizerImpl.java | 2 +-
.../fs/azure/SecureWasbRemoteCallHelper.java | 2 +-
.../fs/azure/ITestBlobDataValidation.java | 2 +-
.../azure/ITestNativeAzureFileSystemAppend.java | 2 +-
.../hadoop/fs/azure/MockStorageInterface.java | 12 +-
...estNativeAzureFileSystemBlockCompaction.java | 2 +-
.../fs/azure/integration/AzureTestUtils.java | 2 +-
.../org/apache/hadoop/tools/DistCpOptions.java | 2 +-
.../org/apache/hadoop/tools/OptionsParser.java | 2 +-
.../apache/hadoop/tools/mapred/CopyMapper.java | 2 +-
.../namenode/ITestProvidedImplementation.java | 2 +-
.../mapred/gridmix/ClusterSummarizer.java | 2 +-
.../mapred/gridmix/ExecutionSummarizer.java | 4 +-
.../hadoop/mapred/gridmix/JobFactory.java | 2 +-
.../mapred/gridmix/RandomTextDataGenerator.java | 2 +-
.../translator/impl/BaseLogParser.java | 1 -
.../WordListAnonymizerUtility.java | 2 +-
.../util/MapReduceJobPropertiesParser.java | 2 +-
.../hadoop/streaming/TestUnconsumedInput.java | 2 +-
.../org/apache/hadoop/yarn/webapp/WebApps.java | 14 +-
.../registry/client/api/RegistryConstants.java | 2 +-
.../amrmproxy/BroadcastAMRMProxyPolicy.java | 11 -
.../amrmproxy/RejectAMRMProxyPolicy.java | 4 -
.../TestBroadcastAMRMProxyFederationPolicy.java | 11 +-
.../yarn/server/nodemanager/NodeManager.java | 66 ++--
.../containermanager/container/Container.java | 6 +
.../container/ContainerImpl.java | 11 +
.../CGroupsMemoryResourceHandlerImpl.java | 24 ++
.../linux/resources/MemoryResourceHandler.java | 10 +
.../resources/gpu/GpuResourceAllocator.java | 68 +++-
.../resources/gpu/GpuResourceHandlerImpl.java | 1 -
.../monitor/ContainersMonitorImpl.java | 108 +++---
.../nodemanager/TestNodeManagerResync.java | 56 +++
.../TestCGroupsMemoryResourceHandlerImpl.java | 43 +++
.../nodemanager/webapp/MockContainer.java | 3 +
.../server/resourcemanager/ResourceManager.java | 2 +-
.../AbstractPreemptableResourceCalculator.java | 21 +-
.../CapacitySchedulerPreemptionContext.java | 2 +
.../CapacitySchedulerPreemptionUtils.java | 23 +-
.../capacity/FifoCandidatesSelector.java | 45 ++-
.../capacity/IntraQueueCandidatesSelector.java | 9 +-
.../capacity/PreemptableResourceCalculator.java | 7 +-
.../capacity/PreemptionCandidatesSelector.java | 11 +
.../ProportionalCapacityPreemptionPolicy.java | 129 +++++--
...QueuePriorityContainerCandidateSelector.java | 16 +-
.../ReservedContainerCandidatesSelector.java | 16 +-
.../monitor/capacity/TempQueuePerPartition.java | 8 +-
.../scheduler/capacity/CapacityScheduler.java | 18 +-
.../CapacitySchedulerConfiguration.java | 17 +
.../resourcemanager/TestRMEmbeddedElector.java | 22 ++
.../TestPreemptionForQueueWithPriorities.java | 58 ++++
...apacityPreemptionPolicyPreemptToBalance.java | 254 ++++++++++++++
...TestCapacitySchedulerSurgicalPreemption.java | 111 ++++++
.../reader/TimelineFromIdConverter.java | 93 +++++
.../reader/TimelineReaderWebServices.java | 198 ++++++++---
.../TestTimelineReaderWebServicesBasicAcl.java | 154 +++++++++
.../site/markdown/yarn-service/RegistryDNS.md | 10 +-
.../markdown/yarn-service/ServiceDiscovery.md | 6 +-
.../src/main/webapp/WEB-INF/web.xml | 6 +-
.../src/main/webapp/app/initializers/loader.js | 10 +-
216 files changed, 3144 insertions(+), 3214 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org