Merge branch 'trunk' into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b2b043ef Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b2b043ef Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b2b043ef Branch: refs/heads/HDFS-7240 Commit: b2b043ef1e61782375e131cca22942f1c24480d3 Parents: c908b1e 55c3277 Author: Anu Engineer <[email protected]> Authored: Wed Jan 24 14:26:09 2018 -0800 Committer: Anu Engineer <[email protected]> Committed: Wed Jan 24 14:26:09 2018 -0800 ---------------------------------------------------------------------- .../src/main/conf/hadoop-policy.xml | 8 + .../hadoop/fs/CommonConfigurationKeys.java | 2 + .../java/org/apache/hadoop/fs/FileContext.java | 4 +- .../java/org/apache/hadoop/fs/FileSystem.java | 4 +- .../main/java/org/apache/hadoop/fs/FsShell.java | 2 + .../apache/hadoop/ha/ZKFailoverController.java | 10 +- .../org/apache/hadoop/http/HttpServer2.java | 39 ++ .../main/java/org/apache/hadoop/io/IOUtils.java | 70 ++- .../apache/hadoop/ipc/DecayRpcScheduler.java | 15 +- .../org/apache/hadoop/security/Credentials.java | 3 +- .../apache/hadoop/security/SecurityUtil.java | 27 +- .../security/ShellBasedUnixGroupsMapping.java | 53 +- .../org/apache/hadoop/util/DataChecksum.java | 60 +- .../main/java/org/apache/hadoop/util/Shell.java | 15 + .../hadoop/util/curator/ZKCuratorManager.java | 17 +- .../src/main/resources/core-default.xml | 59 ++ .../src/site/markdown/CLIMiniCluster.md.vm | 2 +- .../src/site/markdown/CredentialProviderAPI.md | 4 +- .../src/site/markdown/SecureMode.md | 2 +- .../org/apache/hadoop/fs/TestFsShellList.java | 14 + .../java/org/apache/hadoop/io/TestIOUtils.java | 61 +- .../hadoop/ipc/TestDecayRpcScheduler.java | 32 +- .../hadoop/security/TestSecurityUtil.java | 81 +++ .../hadoop/util/Crc32PerformanceTest.java | 17 +- .../java/org/apache/hadoop/util/TestShell.java | 5 + .../java/org/apache/hadoop/hdfs/DFSClient.java | 36 +- .../hadoop/hdfs/DistributedFileSystem.java | 4 +- .../apache/hadoop/hdfs/client/HdfsAdmin.java | 4 +- .../AddErasureCodingPolicyResponse.java | 24 + .../hadoop/hdfs/protocol/ClientProtocol.java | 5 +- .../hadoop/hdfs/protocol/OpenFilesIterator.java | 10 +- .../ClientDatanodeProtocolTranslatorPB.java | 1 + .../ClientNamenodeProtocolTranslatorPB.java | 8 +- .../src/main/proto/ClientNamenodeProtocol.proto | 1 + hadoop-hdfs-project/hadoop-hdfs/pom.xml | 1 + .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 18 + .../apache/hadoop/hdfs/HDFSPolicyProvider.java | 4 + ...tNamenodeProtocolServerSideTranslatorPB.java | 2 +- .../protocol/InterQJournalProtocol.java | 54 ++ .../protocolPB/InterQJournalProtocolPB.java | 40 ++ ...rQJournalProtocolServerSideTranslatorPB.java | 64 ++ .../InterQJournalProtocolTranslatorPB.java | 96 +++ .../qjournal/server/JournalNodeRpcServer.java | 38 +- .../hdfs/qjournal/server/JournalNodeSyncer.java | 57 +- .../hdfs/server/datanode/BPOfferService.java | 24 +- .../server/datanode/ShortCircuitRegistry.java | 2 +- .../erasurecode/StripedBlockReader.java | 4 +- .../datanode/fsdataset/impl/BlockPoolSlice.java | 23 +- .../datanode/fsdataset/impl/FsDatasetImpl.java | 4 +- .../server/datanode/web/DatanodeHttpServer.java | 5 +- .../federation/resolver/MountTableResolver.java | 88 ++- .../server/federation/router/ErasureCoding.java | 198 ++++++ .../federation/router/FederationUtil.java | 20 + .../hdfs/server/federation/router/Quota.java | 208 +++++++ .../hdfs/server/federation/router/Router.java | 38 +- .../federation/router/RouterQuotaManager.java | 160 +++++ .../router/RouterQuotaUpdateService.java | 228 +++++++ .../federation/router/RouterQuotaUsage.java | 119 ++++ .../federation/router/RouterRpcClient.java | 65 +- .../federation/router/RouterRpcServer.java | 287 +++++---- .../federation/router/RouterServiceState.java | 31 + .../server/federation/store/RouterStore.java | 78 +++ .../federation/store/impl/RouterStoreImpl.java | 93 +++ .../protocol/GetRouterRegistrationRequest.java | 47 ++ .../protocol/GetRouterRegistrationResponse.java | 44 ++ .../protocol/GetRouterRegistrationsRequest.java | 34 ++ .../GetRouterRegistrationsResponse.java | 55 ++ .../store/protocol/RouterHeartbeatRequest.java | 50 ++ .../store/protocol/RouterHeartbeatResponse.java | 49 ++ .../pb/GetRouterRegistrationRequestPBImpl.java | 70 +++ .../pb/GetRouterRegistrationResponsePBImpl.java | 79 +++ .../pb/GetRouterRegistrationsRequestPBImpl.java | 61 ++ .../GetRouterRegistrationsResponsePBImpl.java | 102 ++++ .../impl/pb/RouterHeartbeatRequestPBImpl.java | 78 +++ .../impl/pb/RouterHeartbeatResponsePBImpl.java | 70 +++ .../federation/store/records/MountTable.java | 28 + .../federation/store/records/RouterState.java | 169 ++++++ .../store/records/StateStoreVersion.java | 91 +++ .../store/records/impl/pb/MountTablePBImpl.java | 39 ++ .../records/impl/pb/RouterStatePBImpl.java | 202 +++++++ .../impl/pb/StateStoreVersionPBImpl.java | 79 +++ .../hdfs/server/namenode/FSNamesystem.java | 27 +- .../hadoop/hdfs/server/namenode/INodeFile.java | 16 +- .../hdfs/server/namenode/LeaseManager.java | 26 +- .../hdfs/server/namenode/NameNodeRpcServer.java | 8 +- .../hadoop/hdfs/server/namenode/Quota.java | 2 +- .../web/resources/NamenodeWebHdfsMethods.java | 115 ++-- .../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 23 +- .../hdfs/tools/federation/RouterAdmin.java | 144 ++++- .../src/main/proto/FederationProtocol.proto | 47 ++ .../src/main/proto/InterQJournalProtocol.proto | 50 ++ .../src/main/resources/hdfs-default.xml | 38 ++ .../main/webapps/router/federationhealth.html | 2 + .../src/site/markdown/HDFSCommands.md | 8 +- .../markdown/HDFSHighAvailabilityWithNFS.md | 2 +- .../markdown/HDFSHighAvailabilityWithQJM.md | 2 +- .../src/site/markdown/HDFSRouterFederation.md | 29 + .../apache/hadoop/hdfs/StripedFileTestUtil.java | 7 +- .../apache/hadoop/hdfs/TestDecommission.java | 38 +- .../org/apache/hadoop/hdfs/TestHdfsAdmin.java | 4 +- .../hadoop/hdfs/TestLeaseRecoveryStriped.java | 11 +- .../hadoop/hdfs/TestReconstructStripedFile.java | 6 +- .../server/datanode/TestBPOfferService.java | 77 ++- .../server/datanode/TestCachingStrategy.java | 10 +- .../server/federation/RouterConfigBuilder.java | 12 + .../server/federation/RouterDFSCluster.java | 12 +- .../metrics/TestFederationMetrics.java | 1 + .../resolver/TestMountTableResolver.java | 47 ++ .../federation/router/TestRouterAdminCLI.java | 69 +++ .../federation/router/TestRouterQuota.java | 452 ++++++++++++++ .../router/TestRouterQuotaManager.java | 113 ++++ .../server/federation/router/TestRouterRpc.java | 229 ++++++- .../store/driver/TestStateStoreDriverBase.java | 13 + .../store/records/TestMountTable.java | 41 ++ .../store/records/TestRouterState.java | 85 +++ .../hdfs/server/namenode/TestLeaseManager.java | 8 +- .../hdfs/server/namenode/TestListOpenFiles.java | 20 +- .../snapshot/TestOpenFilesWithSnapshot.java | 45 ++ .../apache/hadoop/hdfs/tools/TestDFSAdmin.java | 69 ++- hadoop-mapreduce-project/bin/mapred | 6 + .../hadoop/mapreduce/v2/app/MRAppMaster.java | 23 + .../hadoop/mapreduce/v2/app/TestRecovery.java | 82 +++ .../mapreduce/v2/util/LocalResourceBuilder.java | 7 +- .../hadoop/mapreduce/SharedCacheConfig.java | 7 +- .../lib/output/FileOutputCommitter.java | 22 + .../src/main/resources/mapred-default.xml | 11 + .../site/markdown/DistributedCacheDeploy.md.vm | 61 +- .../src/site/markdown/MapredCommands.md | 19 + .../TestJobResourceUploaderWithSharedCache.java | 8 +- .../lib/output/TestFileOutputCommitter.java | 39 +- .../org/apache/hadoop/fs/TestFileSystem.java | 6 +- .../mapred/uploader/FrameworkUploader.java | 216 ++++++- .../mapred/uploader/TestFrameworkUploader.java | 146 ++++- hadoop-project/pom.xml | 3 +- .../dev-support/findbugs-exclude.xml | 8 + .../fs/aliyun/oss/AliyunOSSFileReaderTask.java | 109 ++++ .../fs/aliyun/oss/AliyunOSSFileSystem.java | 31 +- .../fs/aliyun/oss/AliyunOSSInputStream.java | 149 +++-- .../hadoop/fs/aliyun/oss/AliyunOSSUtils.java | 12 + .../apache/hadoop/fs/aliyun/oss/Constants.java | 13 +- .../apache/hadoop/fs/aliyun/oss/ReadBuffer.java | 86 +++ .../fs/aliyun/oss/TestAliyunOSSInputStream.java | 49 ++ .../fs/s3a/AWSCredentialProviderList.java | 48 +- .../fs/s3a/AssumedRoleCredentialProvider.java | 197 ++++++ .../org/apache/hadoop/fs/s3a/Constants.java | 37 ++ .../java/org/apache/hadoop/fs/s3a/Listing.java | 7 + .../java/org/apache/hadoop/fs/s3a/Retries.java | 21 + .../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 206 ++++--- .../hadoop/fs/s3a/S3AInstrumentation.java | 75 +-- .../java/org/apache/hadoop/fs/s3a/S3AUtils.java | 55 +- .../org/apache/hadoop/fs/s3a/Statistic.java | 8 + .../hadoop/fs/s3a/WriteOperationHelper.java | 1 + .../apache/hadoop/fs/s3a/s3guard/S3Guard.java | 12 +- .../hadoop/fs/s3native/S3xLoginHelper.java | 4 +- .../markdown/tools/hadoop-aws/assumed_roles.md | 595 +++++++++++++++++++ .../markdown/tools/hadoop-aws/committers.md | 6 +- .../src/site/markdown/tools/hadoop-aws/index.md | 55 +- .../site/markdown/tools/hadoop-aws/testing.md | 42 ++ .../tools/hadoop-aws/troubleshooting_s3a.md | 5 +- .../s3a/ITestS3AContractDistCpAssumedRole.java | 52 ++ .../apache/hadoop/fs/s3a/ITestAssumeRole.java | 324 ++++++++++ .../hadoop/fs/s3a/ITestS3ACredentialsInURL.java | 20 +- .../fs/s3a/ITestS3AFileOperationCost.java | 171 ++++-- .../apache/hadoop/fs/s3a/ITestS3AMetrics.java | 24 +- .../hadoop/fs/s3a/ITestS3AMiscOperations.java | 7 + .../org/apache/hadoop/fs/s3a/S3ATestUtils.java | 17 +- .../fs/s3a/TestS3AAWSCredentialsProvider.java | 2 + .../s3a/s3guard/DynamoDBLocalClientFactory.java | 3 + .../fs/s3a/s3guard/ITestS3GuardToolLocal.java | 8 +- hadoop-tools/hadoop-azure-datalake/pom.xml | 3 +- .../hadoop-yarn/conf/container-executor.cfg | 4 +- .../records/ApplicationSubmissionContext.java | 21 + .../hadoop/yarn/api/records/Resource.java | 3 + .../hadoop/yarn/conf/YarnConfiguration.java | 101 +++- .../yarn/util/resource/ResourceUtils.java | 42 +- .../src/main/proto/yarn_protos.proto | 1 + .../yarn/conf/TestYarnConfigurationFields.java | 6 + .../distributedshell/ApplicationMaster.java | 86 ++- .../applications/distributedshell/Client.java | 182 ++++-- .../distributedshell/TestDSAppMaster.java | 86 ++- .../distributedshell/TestDistributedShell.java | 175 +++++- .../yarn/service/client/ApiServiceClient.java | 66 +- .../yarn/service/client/package-info.java | 28 + .../hadoop/yarn/service/webapp/ApiServer.java | 497 +++++++++++----- ...RN-Simplified-V1-API-Layer-For-Services.yaml | 8 +- .../hadoop/yarn/service/TestApiServer.java | 51 +- .../hadoop/yarn/service/ClientAMService.java | 6 +- .../hadoop/yarn/service/ServiceScheduler.java | 13 +- .../yarn/service/client/ServiceClient.java | 93 ++- .../yarn/service/conf/YarnServiceConf.java | 6 + .../provider/AbstractClientProvider.java | 4 +- .../tarball/TarballProviderService.java | 4 +- .../yarn/service/utils/CoreFileSystem.java | 32 +- .../service/utils/ServiceRegistryUtils.java | 37 +- .../yarn/service/TestYarnNativeServices.java | 37 +- .../hadoop/yarn/client/api/AppAdminClient.java | 18 +- .../yarn/client/api/impl/YarnClientImpl.java | 8 +- .../hadoop/yarn/client/cli/ApplicationCLI.java | 67 ++- .../hadoop/yarn/client/cli/TestYarnCLI.java | 18 +- .../pb/ApplicationSubmissionContextPBImpl.java | 74 ++- .../client/api/impl/TimelineClientImpl.java | 6 +- .../client/api/impl/TimelineV2ClientImpl.java | 3 +- .../yarn/util/timeline/TimelineUtils.java | 3 +- .../org/apache/hadoop/yarn/webapp/WebApps.java | 37 +- .../src/main/resources/yarn-default.xml | 18 +- .../registry/client/api/RegistryConstants.java | 1 + .../client/impl/zk/RegistrySecurity.java | 9 +- .../hadoop/registry/server/dns/RegistryDNS.java | 10 +- .../registry/server/dns/TestRegistryDNS.java | 42 ++ .../server/nodemanager/ContainerExecutor.java | 11 + .../hadoop/yarn/server/nodemanager/Context.java | 7 + .../nodemanager/DefaultContainerExecutor.java | 12 + .../nodemanager/LinuxContainerExecutor.java | 59 ++ .../yarn/server/nodemanager/NodeManager.java | 20 + .../nodemanager/api/impl/pb/NMProtoUtils.java | 37 +- .../application/ApplicationEvent.java | 2 +- .../container/ContainerEvent.java | 2 +- .../container/ContainerImpl.java | 30 +- .../deletion/task/DeletionTaskType.java | 2 +- .../task/DockerContainerDeletionTask.java | 92 +++ .../launcher/ContainerLaunch.java | 108 +++- .../NetworkPacketTaggingHandlerImpl.java | 163 +++++ .../resources/NetworkTagMappingJsonManager.java | 317 ++++++++++ .../resources/NetworkTagMappingManager.java | 41 ++ .../NetworkTagMappingManagerFactory.java | 49 ++ .../linux/resources/ResourceHandlerModule.java | 39 +- .../runtime/DockerLinuxContainerRuntime.java | 241 +++++++- .../runtime/docker/DockerCommandExecutor.java | 39 +- .../linux/runtime/docker/DockerKillCommand.java | 40 ++ .../linux/runtime/docker/DockerRunCommand.java | 5 + .../localizer/ContainerLocalizer.java | 27 - .../localizer/event/LocalizationEvent.java | 2 +- .../executor/ContainerReapContext.java | 93 +++ .../impl/container-executor.c | 217 +++++-- .../impl/container-executor.h | 8 + .../main/native/container-executor/impl/main.c | 11 +- .../main/native/container-executor/impl/util.h | 3 +- .../container-executor/impl/utils/docker-util.c | 123 +++- .../container-executor/impl/utils/docker-util.h | 16 +- .../container-executor/impl/utils/path-utils.c | 14 + .../container-executor/impl/utils/path-utils.h | 7 + .../test/test-container-executor.c | 62 +- .../test/utils/test-path-utils.cc | 12 + .../test/utils/test_docker_util.cc | 156 ++++- .../yarn_server_nodemanager_recovery.proto | 1 + .../nodemanager/TestContainerExecutor.java | 12 +- .../nodemanager/TestLinuxContainerExecutor.java | 26 + .../TestLinuxContainerExecutorWithMocks.java | 40 +- .../TestNetworkTagMappingJsonManager.java | 310 ++++++++++ .../amrmproxy/BaseAMRMProxyTest.java | 6 + .../api/impl/pb/TestNMProtoUtils.java | 24 + .../application/TestApplication.java | 6 +- .../container/TestContainer.java | 286 ++++++++- .../task/DockerContainerDeletionMatcher.java | 49 ++ .../task/TestDockerContainerDeletionTask.java | 65 ++ .../TestNetworkPacketTaggingHandlerImpl.java | 182 ++++++ .../runtime/TestDockerContainerRuntime.java | 240 +++++++- .../docker/TestDockerCommandExecutor.java | 166 +++++- .../runtime/docker/TestDockerKillCommand.java | 61 ++ .../TestContainersMonitorResourceChange.java | 6 + .../executor/TestContainerReapContext.java | 53 ++ .../server/resourcemanager/AdminService.java | 3 +- .../server/resourcemanager/ResourceManager.java | 68 ++- .../metrics/CombinedSystemMetricsPublisher.java | 108 ++++ ...QueuePriorityContainerCandidateSelector.java | 11 +- .../server/resourcemanager/rmapp/RMApp.java | 6 + .../server/resourcemanager/rmapp/RMAppImpl.java | 31 +- .../rmapp/attempt/RMAppAttemptImpl.java | 9 +- .../scheduler/AbstractResourceUsage.java | 2 +- .../scheduler/AbstractYarnScheduler.java | 7 +- .../scheduler/AppSchedulingInfo.java | 34 +- .../scheduler/ApplicationPlacementFactory.java | 63 ++ .../scheduler/ResourceUsage.java | 16 + .../scheduler/SchedulerApplicationAttempt.java | 13 +- .../scheduler/capacity/CapacityScheduler.java | 12 +- .../CapacitySchedulerConfiguration.java | 22 +- .../scheduler/capacity/LeafQueue.java | 31 +- .../common/ApplicationSchedulingConfig.java | 35 ++ .../scheduler/common/fica/FiCaSchedulerApp.java | 11 +- .../scheduler/fair/FSAppAttempt.java | 1 + .../scheduler/fair/FSOpDurations.java | 2 + .../scheduler/fair/FSPreemptionThread.java | 1 + .../scheduler/fair/FairScheduler.java | 93 ++- .../fair/FairSchedulerConfiguration.java | 180 +++++- .../scheduler/fifo/FifoScheduler.java | 2 - .../placement/AppPlacementAllocator.java | 9 + .../LocalityAppPlacementAllocator.java | 11 + .../webapp/CapacitySchedulerPage.java | 32 +- .../webapp/dao/PartitionResourcesInfo.java | 19 +- .../webapp/dao/ResourcesInfo.java | 4 +- .../yarn/server/resourcemanager/MockNM.java | 26 +- .../yarn/server/resourcemanager/MockRM.java | 6 +- .../ParameterizedSchedulerTestBase.java | 8 + .../resourcemanager/TestRMTimelineService.java | 122 ++++ .../TestWorkPreservingRMRestart.java | 39 ++ .../applicationsmanager/MockAsm.java | 5 + .../TestCombinedSystemMetricsPublisher.java | 476 +++++++++++++++ .../server/resourcemanager/rmapp/MockRMApp.java | 5 + .../rmapp/TestRMAppTransitions.java | 35 ++ .../attempt/TestRMAppAttemptTransitions.java | 27 +- .../scheduler/TestAppSchedulingInfo.java | 12 +- .../capacity/TestCapacityScheduler.java | 11 +- ...CapacitySchedulerWithMultiResourceTypes.java | 139 +++++ .../scheduler/fair/FairSchedulerTestBase.java | 22 +- .../fair/TestContinuousScheduling.java | 8 + .../scheduler/fair/TestFSAppAttempt.java | 8 +- .../scheduler/fair/TestFairScheduler.java | 65 +- .../fair/TestFairSchedulerConfiguration.java | 289 +++++++++ .../TestRMWebServicesForCSWithPartitions.java | 4 +- .../hadoop/yarn/server/MiniYARNCluster.java | 15 +- .../server/TestContainerManagerSecurity.java | 19 +- .../webproxy/amfilter/AmFilterInitializer.java | 3 +- .../src/site/markdown/DockerContainers.md | 15 +- .../src/site/markdown/FairScheduler.md | 11 +- .../src/site/markdown/TimelineServiceV2.md | 28 +- .../hadoop-yarn-site/src/site/markdown/YARN.md | 2 +- .../src/site/markdown/YarnCommands.md | 2 +- .../src/site/markdown/yarn-service/Examples.md | 4 +- .../site/markdown/yarn-service/QuickStart.md | 12 +- .../markdown/yarn-service/ServiceDiscovery.md | 9 +- .../markdown/yarn-service/YarnServiceAPI.md | 30 +- .../src/main/webapp/app/adapters/yarn-log.js | 2 +- .../src/main/webapp/app/initializers/loader.js | 41 +- .../src/main/webapp/app/routes/yarn-node-app.js | 1 + .../main/webapp/app/routes/yarn-node-apps.js | 1 + .../webapp/app/routes/yarn-node-containers.js | 1 + .../src/main/webapp/app/serializers/yarn-log.js | 6 + .../src/main/webapp/app/services/hosts.js | 4 + .../src/main/webapp/app/utils/converter.js | 7 +- .../src/main/webapp/app/utils/date-utils.js | 27 + .../src/main/webapp/config/default-config.js | 1 + .../src/main/webapp/ember-cli-build.js | 1 + 332 files changed, 15281 insertions(+), 1728 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2b043ef/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2b043ef/hadoop-hdfs-project/hadoop-hdfs/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2b043ef/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2b043ef/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java ---------------------------------------------------------------------- diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java index ed67d4d,2e46b28..dbc03c2 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java @@@ -98,15 -96,10 +99,17 @@@ public class DatanodeHttpServer impleme this.restCsrfPreventionFilter = createRestCsrfPreventionFilter(conf); this.conf = conf; + final ObjectStoreJerseyContainer finalContainer; + if (objectStoreHandler != null) { + finalContainer = objectStoreHandler.getObjectStoreJerseyContainer(); + } else { + finalContainer = null; + } + Configuration confForInfoServer = new Configuration(conf); confForInfoServer.setInt(HttpServer2.HTTP_MAX_THREADS_KEY, 10); + int proxyPort = + confForInfoServer.getInt(DFS_DATANODE_HTTP_INTERNAL_PROXY_PORT, 0); HttpServer2.Builder builder = new HttpServer2.Builder() .setName("datanode") .setConf(confForInfoServer) http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2b043ef/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2b043ef/hadoop-project/pom.xml ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
