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/fc093528 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fc093528 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fc093528 Branch: refs/heads/HDFS-12943 Commit: fc093528247985ca3e539784c103a034cc9c684e Parents: dc76e0f bca928d Author: Konstantin V Shvachko <s...@apache.org> Authored: Thu Oct 11 22:34:56 2018 -0700 Committer: Konstantin V Shvachko <s...@apache.org> Committed: Thu Oct 11 22:34:56 2018 -0700 ---------------------------------------------------------------------- .../hadoop-client-check-invariants/pom.xml | 2 + .../hadoop-client-check-test-invariants/pom.xml | 2 + .../hadoop-client-minicluster/pom.xml | 12 + .../hadoop-client-runtime/pom.xml | 13 + hadoop-common-project/hadoop-common/pom.xml | 7 +- .../org/apache/hadoop/conf/Configurable.java | 10 +- .../org/apache/hadoop/conf/Configuration.java | 71 +- .../hadoop/conf/ConfigurationWithLogging.java | 14 +- .../org/apache/hadoop/crypto/CryptoCodec.java | 7 +- .../apache/hadoop/crypto/CryptoInputStream.java | 4 +- .../hadoop/crypto/CryptoOutputStream.java | 4 +- .../org/apache/hadoop/crypto/Decryptor.java | 14 +- .../org/apache/hadoop/crypto/Encryptor.java | 14 +- .../org/apache/hadoop/crypto/OpensslCipher.java | 18 +- .../hadoop/crypto/key/JavaKeyStoreProvider.java | 15 +- .../apache/hadoop/crypto/key/KeyProvider.java | 6 +- .../crypto/key/KeyProviderCryptoExtension.java | 9 +- .../KeyProviderDelegationTokenExtension.java | 2 +- .../crypto/key/kms/KMSClientProvider.java | 6 +- .../hadoop/crypto/key/kms/ValueQueue.java | 2 +- .../crypto/random/OpensslSecureRandom.java | 10 +- .../apache/hadoop/fs/AbstractFileSystem.java | 45 +- .../apache/hadoop/fs/BufferedFSInputStream.java | 4 +- .../apache/hadoop/fs/ByteBufferReadable.java | 8 +- .../apache/hadoop/fs/ChecksumFileSystem.java | 2 +- .../java/org/apache/hadoop/fs/ChecksumFs.java | 2 +- .../hadoop/fs/CommonConfigurationKeys.java | 2 +- .../java/org/apache/hadoop/fs/CreateFlag.java | 2 +- .../org/apache/hadoop/fs/FSDataInputStream.java | 1 + .../org/apache/hadoop/fs/FSInputChecker.java | 2 +- .../java/org/apache/hadoop/fs/FileContext.java | 51 +- .../java/org/apache/hadoop/fs/FileSystem.java | 11 +- .../java/org/apache/hadoop/fs/FileUtil.java | 4 +- .../org/apache/hadoop/fs/HarFileSystem.java | 2 +- .../hadoop/fs/HasEnhancedByteBufferAccess.java | 15 +- .../org/apache/hadoop/fs/LocalDirAllocator.java | 3 +- .../org/apache/hadoop/fs/LocalFileSystem.java | 2 +- .../main/java/org/apache/hadoop/fs/Options.java | 2 +- .../java/org/apache/hadoop/fs/QuotaUsage.java | 8 +- .../org/apache/hadoop/fs/ftp/FTPFileSystem.java | 6 +- .../org/apache/hadoop/fs/ftp/FtpConfigKeys.java | 1 + .../apache/hadoop/fs/local/LocalConfigKeys.java | 1 + .../apache/hadoop/fs/permission/AclStatus.java | 2 +- .../apache/hadoop/fs/permission/AclUtil.java | 10 +- .../hadoop/fs/permission/ScopedAclEntries.java | 14 +- .../org/apache/hadoop/fs/shell/Command.java | 24 +- .../apache/hadoop/fs/shell/CommandFormat.java | 2 +- .../org/apache/hadoop/fs/viewfs/ViewFs.java | 12 +- .../apache/hadoop/ha/ActiveStandbyElector.java | 32 +- .../main/java/org/apache/hadoop/ha/HAAdmin.java | 2 +- .../java/org/apache/hadoop/ha/NodeFencer.java | 2 +- .../org/apache/hadoop/ha/SshFenceByTcpPort.java | 2 +- .../org/apache/hadoop/http/HttpServer2.java | 10 +- .../org/apache/hadoop/io/EnumSetWritable.java | 2 +- .../main/java/org/apache/hadoop/io/IOUtils.java | 2 +- .../org/apache/hadoop/io/ReadaheadPool.java | 2 +- .../org/apache/hadoop/io/SecureIOUtils.java | 4 +- .../java/org/apache/hadoop/io/SequenceFile.java | 16 +- .../java/org/apache/hadoop/io/Writable.java | 4 +- .../apache/hadoop/io/WritableComparable.java | 7 +- .../org/apache/hadoop/io/WritableUtils.java | 6 +- .../io/compress/CompressionCodecFactory.java | 8 +- .../org/apache/hadoop/io/compress/Lz4Codec.java | 4 +- .../apache/hadoop/io/compress/SnappyCodec.java | 2 +- .../io/compress/bzip2/Bzip2Compressor.java | 2 +- .../io/compress/bzip2/Bzip2Decompressor.java | 6 +- .../hadoop/io/compress/bzip2/Bzip2Factory.java | 4 +- .../io/compress/bzip2/CBZip2InputStream.java | 26 +- .../io/compress/bzip2/CBZip2OutputStream.java | 7 +- .../compress/zlib/BuiltInGzipDecompressor.java | 8 +- .../hadoop/io/compress/zlib/ZlibCompressor.java | 2 +- .../io/compress/zlib/ZlibDecompressor.java | 6 +- .../hadoop/io/compress/zlib/ZlibFactory.java | 4 +- .../apache/hadoop/io/erasurecode/CodecUtil.java | 2 +- .../erasurecode/rawcoder/util/GaloisField.java | 2 +- .../org/apache/hadoop/io/file/tfile/TFile.java | 8 +- .../org/apache/hadoop/io/file/tfile/Utils.java | 48 +- .../org/apache/hadoop/io/retry/RetryProxy.java | 4 +- .../hadoop/io/serializer/Deserializer.java | 2 +- .../apache/hadoop/io/serializer/Serializer.java | 2 +- .../org/apache/hadoop/ipc/CallerContext.java | 2 +- .../main/java/org/apache/hadoop/ipc/Client.java | 9 +- .../java/org/apache/hadoop/ipc/ClientCache.java | 6 +- .../apache/hadoop/ipc/DecayRpcScheduler.java | 3 +- .../org/apache/hadoop/ipc/RefreshHandler.java | 1 - .../org/apache/hadoop/ipc/RemoteException.java | 2 +- .../main/java/org/apache/hadoop/ipc/Server.java | 2 +- .../org/apache/hadoop/jmx/JMXJsonServlet.java | 6 +- .../apache/hadoop/log/LogThrottlingHelper.java | 8 +- .../metrics2/lib/MutableRollingAverages.java | 2 +- .../apache/hadoop/metrics2/package-info.java | 3 + .../metrics2/sink/RollingFileSystemSink.java | 2 +- .../apache/hadoop/metrics2/sink/StatsDSink.java | 4 +- .../org/apache/hadoop/metrics2/util/MBeans.java | 10 +- .../hadoop/net/AbstractDNSToSwitchMapping.java | 8 +- .../main/java/org/apache/hadoop/net/DNS.java | 2 +- .../apache/hadoop/net/DNSToSwitchMapping.java | 2 +- .../java/org/apache/hadoop/net/NetUtils.java | 14 +- .../org/apache/hadoop/net/NetworkTopology.java | 12 +- .../net/NetworkTopologyWithNodeGroup.java | 4 +- .../apache/hadoop/net/ScriptBasedMapping.java | 8 +- .../net/ScriptBasedMappingWithDependency.java | 7 +- .../apache/hadoop/net/SocketOutputStream.java | 6 +- .../AuthenticationFilterInitializer.java | 6 +- .../hadoop/security/HadoopKerberosName.java | 2 +- .../security/IdMappingServiceProvider.java | 5 +- .../apache/hadoop/security/SaslRpcClient.java | 10 +- .../apache/hadoop/security/SecurityUtil.java | 3 +- .../hadoop/security/UserGroupInformation.java | 20 +- .../security/alias/JavaKeyStoreProvider.java | 6 +- .../alias/LocalJavaKeyStoreProvider.java | 3 +- .../hadoop/security/authorize/ProxyUsers.java | 4 +- .../security/ssl/FileBasedKeyStoresFactory.java | 4 +- .../apache/hadoop/security/ssl/SSLFactory.java | 4 +- .../security/ssl/SSLHostnameVerifier.java | 20 +- .../web/DelegationTokenAuthenticatedURL.java | 14 +- .../DelegationTokenAuthenticationFilter.java | 6 +- .../DelegationTokenAuthenticationHandler.java | 4 +- .../delegation/web/DelegationTokenManager.java | 2 +- ...rosDelegationTokenAuthenticationHandler.java | 2 +- .../KerberosDelegationTokenAuthenticator.java | 2 +- ...emeDelegationTokenAuthenticationHandler.java | 3 +- ...udoDelegationTokenAuthenticationHandler.java | 2 +- .../web/PseudoDelegationTokenAuthenticator.java | 2 +- .../hadoop/service/ServiceOperations.java | 4 +- .../service/launcher/ServiceLauncher.java | 2 +- .../hadoop/service/launcher/package-info.java | 2 +- .../java/org/apache/hadoop/util/ClassUtil.java | 1 - .../apache/hadoop/util/ComparableVersion.java | 2 +- .../java/org/apache/hadoop/util/FindClass.java | 4 +- .../hadoop/util/GenericOptionsParser.java | 21 +- .../apache/hadoop/util/HttpExceptionUtils.java | 6 +- .../apache/hadoop/util/JsonSerialization.java | 2 +- .../apache/hadoop/util/LightWeightCache.java | 10 +- .../java/org/apache/hadoop/util/LineReader.java | 3 - .../org/apache/hadoop/util/MachineList.java | 2 +- .../apache/hadoop/util/ShutdownHookManager.java | 2 +- .../hadoop/util/ShutdownThreadsHelper.java | 2 - .../org/apache/hadoop/util/StringUtils.java | 6 +- .../main/java/org/apache/hadoop/util/Tool.java | 2 +- .../java/org/apache/hadoop/util/ZKUtil.java | 4 +- .../hadoop/util/bloom/DynamicBloomFilter.java | 5 +- .../apache/hadoop/util/concurrent/AsyncGet.java | 2 +- .../apache/hadoop/util/hash/JenkinsHash.java | 4 +- .../src/main/resources/core-default.xml | 26 +- .../org/apache/hadoop/cli/util/CLICommand.java | 6 +- .../apache/hadoop/cli/util/CLICommandFS.java | 4 +- .../apache/hadoop/cli/util/CLICommandTypes.java | 6 +- .../conf/TestConfigurationDeprecation.java | 88 ++- .../apache/hadoop/http/TestSSLHttpServer.java | 204 ++--- .../rawcoder/RawErasureCoderBenchmark.java | 4 +- .../hadoop/io/retry/TestDefaultRetryPolicy.java | 4 +- .../org/apache/hadoop/net/StaticMapping.java | 4 +- .../apache/hadoop/tracing/SetSpanReceiver.java | 2 +- hadoop-common-project/hadoop-kms/pom.xml | 5 +- hadoop-hdds/client/pom.xml | 4 +- .../hadoop/hdds/scm/XceiverClientGrpc.java | 6 +- .../hadoop/hdds/scm/XceiverClientRatis.java | 4 +- .../hdds/scm/storage/ChunkInputStream.java | 2 +- .../hdds/scm/storage/ChunkOutputStream.java | 15 +- hadoop-hdds/common/pom.xml | 10 +- .../org/apache/hadoop/hdds/HddsConfigKeys.java | 2 +- .../apache/hadoop/hdds/scm/ScmConfigKeys.java | 6 +- .../scm/storage/ContainerProtocolCalls.java | 27 +- .../apache/hadoop/ozone/OzoneConfigKeys.java | 8 +- .../container/common/helpers/BlockData.java | 12 + .../org/apache/hadoop/utils/RocksDBStore.java | 3 +- .../org/apache/hadoop/utils/db/RDBStore.java | 3 +- .../main/java/org/apache/ratis/RatisHelper.java | 14 +- .../main/proto/DatanodeContainerProtocol.proto | 3 +- .../common/src/main/resources/ozone-default.xml | 35 +- hadoop-hdds/container-service/pom.xml | 4 +- .../states/endpoint/RegisterEndpointTask.java | 2 +- .../transport/server/GrpcXceiverService.java | 2 +- .../transport/server/XceiverServerGrpc.java | 8 +- .../server/ratis/ContainerStateMachine.java | 423 +++-------- .../server/ratis/XceiverServerRatis.java | 19 +- .../container/keyvalue/helpers/BlockUtils.java | 5 +- .../container/keyvalue/helpers/ChunkUtils.java | 2 +- .../keyvalue/helpers/SmallFileUtils.java | 2 +- .../keyvalue/impl/BlockManagerImpl.java | 1 - .../background/BlockDeletingService.java | 2 +- .../replication/GrpcReplicationClient.java | 6 +- .../replication/GrpcReplicationService.java | 4 +- .../protocol/StorageContainerNodeProtocol.java | 8 + .../common/impl/TestHddsDispatcher.java | 2 +- hadoop-hdds/framework/pom.xml | 4 +- hadoop-hdds/pom.xml | 2 +- hadoop-hdds/server-scm/pom.xml | 6 +- .../hadoop/hdds/scm/node/NodeManager.java | 7 + .../hadoop/hdds/scm/node/SCMNodeManager.java | 26 +- .../hdds/scm/server/SCMChillModeManager.java | 12 +- .../scm/server/SCMClientProtocolServer.java | 2 +- .../server/SCMDatanodeHeartbeatDispatcher.java | 107 ++- .../scm/server/StorageContainerManager.java | 2 +- .../hdds/scm/container/MockNodeManager.java | 11 + .../hadoop/hdds/scm/node/TestNodeManager.java | 53 -- .../scm/server/TestSCMChillModeManager.java | 53 +- .../TestSCMDatanodeHeartbeatDispatcher.java | 41 +- .../testutils/ReplicationNodeManagerMock.java | 11 + hadoop-hdds/tools/pom.xml | 4 +- .../org/apache/hadoop/hdfs/DFSInputStream.java | 8 + .../org/apache/hadoop/hdfs/DFSOutputStream.java | 21 +- .../hadoop/hdfs/DFSStripedInputStream.java | 22 + .../org/apache/hadoop/hdfs/ReaderStrategy.java | 15 - .../org/apache/hadoop/hdfs/StripeReader.java | 23 +- .../hdfs/client/HdfsClientConfigKeys.java | 3 + .../hadoop/hdfs/client/impl/DfsClientConf.java | 8 + .../org/apache/hadoop/hdfs/inotify/Event.java | 14 + .../hadoop/hdfs/protocolPB/PBHelperClient.java | 60 +- .../apache/hadoop/hdfs/util/IOUtilsClient.java | 10 +- .../hadoop/hdfs/util/StripedBlockUtil.java | 65 +- .../hadoop/hdfs/web/resources/GetOpParam.java | 12 +- .../src/main/proto/inotify.proto | 1 + hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 2 +- .../hadoop/fs/http/client/HttpFSFileSystem.java | 16 +- .../hadoop/fs/http/server/FSOperations.java | 35 + .../http/server/HttpFSParametersProvider.java | 1 + .../hadoop/fs/http/server/HttpFSServer.java | 8 + .../fs/http/client/BaseTestHttpFSWith.java | 54 +- .../hadoop/fs/http/server/TestHttpFSServer.java | 53 ++ hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 2 +- .../hdfs/server/federation/router/Quota.java | 54 +- .../driver/impl/StateStoreFileSystemImpl.java | 16 +- .../router/web/RouterWebHDFSContract.java | 1 + hadoop-hdfs-project/hadoop-hdfs/pom.xml | 2 +- .../hdfs/server/datanode/BlockReceiver.java | 43 +- .../erasurecode/ErasureCodingWorker.java | 3 +- .../erasurecode/StripedBlockReader.java | 14 +- .../datanode/erasurecode/StripedReader.java | 17 +- .../erasurecode/StripedReconstructor.java | 3 +- .../datanode/fsdataset/impl/BlockPoolSlice.java | 6 +- .../datanode/fsdataset/impl/ReplicaMap.java | 2 +- .../hdfs/server/namenode/FSNamesystem.java | 2 +- .../namenode/InotifyFSEditLogOpTranslator.java | 3 + .../web/resources/NamenodeWebHdfsMethods.java | 14 + .../hdfs/tools/DelegationTokenFetcher.java | 58 +- .../org/apache/hadoop/hdfs/web/JsonUtil.java | 32 + .../src/main/resources/hdfs-default.xml | 22 +- .../hadoop-hdfs/src/site/markdown/WebHDFS.md | 173 +++++ .../hadoop/hdfs/TestDFSClientRetries.java | 47 +- .../hdfs/TestDFSInotifyEventInputStream.java | 100 +++ .../TestDistributedFileSystemWithECFile.java | 44 ++ .../TestNameNodeMetadataConsistency.java | 2 + .../org/apache/hadoop/hdfs/web/TestWebHDFS.java | 148 ++++ .../hadoop/tools/TestHdfsConfigFields.java | 1 + .../hadoop-mapreduce-client-app/pom.xml | 20 + .../hadoop-mapreduce-client-common/pom.xml | 7 + .../hadoop-mapreduce-client-core/pom.xml | 8 + .../apache/hadoop/mapred/FileInputFormat.java | 8 +- .../org/apache/hadoop/mapred/OutputFormat.java | 3 + .../apache/hadoop/mapreduce/OutputFormat.java | 3 + .../mapreduce/lib/input/FileInputFormat.java | 10 +- .../hadoop-mapreduce-client-jobclient/pom.xml | 7 +- .../hadoop-mapreduce-client-shuffle/pom.xml | 7 + hadoop-ozone/client/pom.xml | 4 +- .../apache/hadoop/ozone/client/ObjectStore.java | 48 ++ .../ozone/client/io/ChunkGroupInputStream.java | 3 +- .../ozone/client/io/ChunkGroupOutputStream.java | 21 +- .../ozone/client/protocol/ClientProtocol.java | 35 + .../hadoop/ozone/client/rest/RestClient.java | 25 + .../hadoop/ozone/client/rpc/RpcClient.java | 32 + hadoop-ozone/common/pom.xml | 4 +- hadoop-ozone/common/src/main/bin/ozone | 4 +- hadoop-ozone/common/src/main/bin/start-ozone.sh | 10 +- hadoop-ozone/common/src/main/bin/stop-ozone.sh | 10 +- .../src/main/conf/om-audit-log4j2.properties | 14 +- .../ozone/om/helpers/OmKeyLocationInfo.java | 17 +- .../ozone/om/protocol/OzoneManagerProtocol.java | 25 + ...neManagerProtocolClientSideTranslatorPB.java | 51 ++ .../src/main/proto/OzoneManagerProtocol.proto | 33 + hadoop-ozone/datanode/pom.xml | 4 +- hadoop-ozone/dist/pom.xml | 4 +- hadoop-ozone/docs/content/CommandShell.md | 2 +- hadoop-ozone/docs/content/Hdds.md | 2 +- hadoop-ozone/docs/content/OzoneFS.md | 2 +- hadoop-ozone/docs/pom.xml | 4 +- hadoop-ozone/integration-test/pom.xml | 4 +- .../ozone/TestStorageContainerManager.java | 13 + .../rpc/TestCloseContainerHandlingByClient.java | 1 - .../ozone/client/rpc/TestOzoneRpcClient.java | 34 + .../ozone/container/ContainerTestHelper.java | 3 +- .../common/impl/TestCloseContainerHandler.java | 2 +- .../container/server/TestContainerServer.java | 1 - .../server/TestContainerStateMachine.java | 201 ----- .../hadoop/ozone/ozShell/TestOzoneShell.java | 48 ++ .../TestGetCommittedBlockLengthAndPutKey.java | 4 +- hadoop-ozone/objectstore-service/pom.xml | 4 +- hadoop-ozone/ozone-manager/pom.xml | 6 +- .../apache/hadoop/ozone/om/KeyManagerImpl.java | 2 + .../apache/hadoop/ozone/om/OzoneManager.java | 23 + .../hadoop/ozone/om/S3BucketManagerImpl.java | 11 + ...neManagerProtocolServerSideTranslatorPB.java | 187 +++-- .../hadoop/ozone/web/ozShell/Handler.java | 28 + .../web/ozShell/volume/DeleteVolumeHandler.java | 12 +- .../web/ozShell/volume/InfoVolumeHandler.java | 22 +- .../web/ozShell/volume/UpdateVolumeHandler.java | 12 +- hadoop-ozone/ozonefs/pom.xml | 4 +- .../apache/hadoop/fs/ozone/OzoneFileSystem.java | 16 +- .../fs/ozone/TestOzoneFileInterfaces.java | 17 +- hadoop-ozone/pom.xml | 6 +- hadoop-ozone/s3gateway/pom.xml | 4 +- .../CommonHeadersContainerResponseFilter.java | 9 + .../apache/hadoop/ozone/s3/EndpointBase.java | 23 +- .../hadoop/ozone/s3/RequestIdentifier.java | 48 ++ .../hadoop/ozone/s3/bucket/DeleteBucket.java | 32 +- .../hadoop/ozone/s3/bucket/HeadBucket.java | 21 +- .../ozone/s3/exception/OS3ExceptionMapper.java | 9 + .../hadoop/ozone/s3/exception/S3ErrorTable.java | 15 +- .../hadoop/ozone/s3/object/HeadObject.java | 38 +- .../hadoop/ozone/client/OzoneBucketStub.java | 6 +- .../hadoop/ozone/client/OzoneVolumeStub.java | 23 +- .../ozone/s3/bucket/TestDeleteBucket.java | 106 +++ .../hadoop/ozone/s3/bucket/TestHeadBucket.java | 9 +- .../ozone/s3/exception/TestOS3Exception.java | 3 +- .../hadoop/ozone/s3/object/TestHeadObject.java | 95 +++ hadoop-ozone/tools/pom.xml | 10 +- .../apache/hadoop/ozone/freon/ProgressBar.java | 210 +++++ .../genesis/BenchMarkDatanodeDispatcher.java | 2 +- .../hadoop/ozone/freon/TestProgressBar.java | 112 +++ hadoop-project/pom.xml | 34 +- .../fs/s3a/s3guard/DynamoDBMetadataStore.java | 91 ++- .../s3a/s3guard/TestDynamoDBMiscOperations.java | 94 +++ .../azurebfs/AbstractAbfsIntegrationTest.java | 3 +- .../ITestAzureBlobFileSystemBackCompat.java | 6 +- .../ITestAzureBlobFileSystemFileStatus.java | 12 +- .../ITestAzureBlobFileSystemFinalize.java | 8 +- .../azurebfs/ITestAzureBlobFileSystemFlush.java | 5 - .../ITestAzureBlobFileSystemInitAndCreate.java | 3 +- .../ITestAzureBlobFileSystemRandomRead.java | 12 +- .../fs/azurebfs/ITestWasbAbfsCompatibility.java | 14 +- .../tools/rumen/Pre21JobHistoryConstants.java | 11 +- .../yarn/service/conf/YarnServiceConf.java | 5 +- .../runtimes/yarnservice/YarnServiceUtils.java | 17 +- .../src/site/markdown/Index.md | 4 + .../src/site/markdown/InstallationGuide.md | 760 +++++++++++++++++++ .../markdown/InstallationGuideChineseVersion.md | 757 ++++++++++++++++++ .../hadoop/yarn/client/cli/RMAdminCLI.java | 9 +- .../hadoop/yarn/client/cli/TestRMAdminCLI.java | 7 +- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 2 +- .../yarn/client/api/TimelineReaderClient.java | 120 +++ .../api/impl/TimelineReaderClientImpl.java | 239 ++++++ .../api/impl/TestTimelineReaderClientImpl.java | 157 ++++ .../registry/client/api/RegistryConstants.java | 11 - .../pom.xml | 2 +- .../webapp/AHSWebServices.java | 250 ++---- .../webapp/TestAHSWebServices.java | 7 +- .../yarn/server/AMHeartbeatRequestHandler.java | 10 +- .../hadoop/yarn/server/AMRMClientRelayer.java | 6 +- .../server/uam/UnmanagedApplicationManager.java | 20 +- .../yarn/server/webapp/LogWebService.java | 506 ++++++++++++ .../yarn/server/webapp/LogWebServiceUtils.java | 258 +++++++ .../server/webapp/YarnWebServiceParams.java | 1 + .../yarn/server/MockResourceManagerFacade.java | 29 +- .../uam/TestUnmanagedApplicationManager.java | 51 +- .../yarn/server/webapp/TestLogWebService.java | 126 +++ .../hadoop-yarn-server-nodemanager/pom.xml | 4 + .../server/nodemanager/ContainerExecutor.java | 12 + .../nodemanager/DefaultContainerExecutor.java | 16 + .../nodemanager/LinuxContainerExecutor.java | 33 + .../amrmproxy/FederationInterceptor.java | 291 +++---- .../launcher/ContainerCleanup.java | 229 ++++++ .../launcher/ContainerLaunch.java | 236 ++---- .../launcher/ContainersLauncher.java | 14 +- .../executor/ContainerExecContext.java | 85 +++ .../webapp/ContainerShellWebSocket.java | 106 +++ .../webapp/ContainerShellWebSocketServlet.java | 36 + .../server/nodemanager/webapp/WebServer.java | 5 + .../impl/container-executor.c | 164 +++- .../impl/container-executor.h | 7 +- .../main/native/container-executor/impl/util.h | 3 +- .../container-executor/impl/utils/docker-util.c | 53 ++ .../container-executor/impl/utils/docker-util.h | 10 + .../test/utils/test_docker_util.cc | 29 + .../nodemanager/TestContainerExecutor.java | 15 + .../nodemanager/TestLinuxContainerExecutor.java | 12 + .../amrmproxy/TestFederationInterceptor.java | 16 +- .../TestableFederationInterceptor.java | 26 +- .../launcher/TestContainerCleanup.java | 108 +++ .../launcher/TestContainersLauncher.java | 12 +- .../TestContainersMonitorResourceChange.java | 8 + .../webapp/ContainerShellClientSocketTest.java | 80 ++ .../webapp/TestNMContainerWebSocket.java | 149 ++++ .../server/resourcemanager/ClientRMService.java | 47 +- .../scheduler/ClusterNodeTracker.java | 11 + .../scheduler/capacity/CapacityScheduler.java | 12 +- .../capacity/TestContainerAllocation.java | 52 ++ .../webapp/TestRMWebServicesApps.java | 211 +++-- .../hadoop-yarn-server-tests/pom.xml | 2 +- .../reader/TimelineReaderServer.java | 4 +- .../reader/TimelineReaderWebServicesUtils.java | 21 +- ...elineReaderWhitelistAuthorizationFilter.java | 2 +- .../storage/FileSystemTimelineReaderImpl.java | 87 ++- .../hadoop-yarn-server-web-proxy/pom.xml | 8 + .../markdown/registry/registry-configuration.md | 56 -- .../src/site/markdown/registry/yarn-registry.md | 15 - .../hadoop-yarn/hadoop-yarn-ui/pom.xml | 8 + .../main/webapp/app/models/cluster-metric.js | 6 +- .../src/main/webapp/app/styles/app.scss | 8 + .../src/main/webapp/app/styles/compose-box.scss | 6 +- .../src/main/webapp/app/styles/layout.scss | 8 + .../webapp/app/templates/yarn-app-attempt.hbs | 80 +- .../webapp/app/templates/yarn-app/attempts.hbs | 2 +- .../webapp/app/templates/yarn-app/configs.hbs | 93 ++- .../main/webapp/app/templates/yarn-app/info.hbs | 2 +- .../app/templates/yarn-component-instance.hbs | 22 +- .../app/templates/yarn-component-instances.hbs | 33 +- .../main/webapp/app/templates/yarn-queue.hbs | 11 - .../webapp/app/templates/yarn-queue/apps.hbs | 5 +- pom.xml | 2 +- 410 files changed, 8870 insertions(+), 2842 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc093528/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc093528/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java ---------------------------------------------------------------------- diff --cc hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java index 99c1f3e,49f1e49..ea79887 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java @@@ -1421,8 -1392,7 +1421,8 @@@ public class Client implements AutoClos * @param serviceClass - service class for RPC * @param fallbackToSimpleAuth - set to true or false during this method to * indicate if a secure client falls back to simple auth + * @param alignmentContext - state alignment context - * @returns the rpc response + * @return the rpc response * Throws exceptions if there are network problems or if the remote code * threw an exception. */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc093528/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc093528/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc093528/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc093528/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
