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 dr...@apache.org on 2016/10/08 06:10:46 UTC
[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into
HADOOP-12756
Merge branch 'trunk' into HADOOP-12756
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a57bba47
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a57bba47
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a57bba47
Branch: refs/heads/HADOOP-12756
Commit: a57bba470b396c163baef7ac9447c063180ec15b
Parents: 26d5df3 6a38d11
Author: Kai Zheng <ka...@intel.com>
Authored: Sun Oct 9 10:29:40 2016 +0800
Committer: Kai Zheng <ka...@intel.com>
Committed: Sun Oct 9 10:29:40 2016 +0800
----------------------------------------------------------------------
.../IncludePublicAnnotationsJDiffDoclet.java | 64 +
.../util/RolloverSignerSecretProvider.java | 2 +-
.../util/TestZKSignerSecretProvider.java | 221 +-
.../dev-support/findbugsExcludeFile.xml | 5 +
.../jdiff/Apache_Hadoop_Common_2.7.2.xml | 41149 ++++++-----------
.../org/apache/hadoop/conf/ConfServlet.java | 19 +-
.../org/apache/hadoop/conf/Configuration.java | 284 +-
.../apache/hadoop/fs/DFCachingGetSpaceUsed.java | 48 +
.../src/main/java/org/apache/hadoop/fs/DU.java | 8 +-
.../apache/hadoop/fs/FileEncryptionInfo.java | 21 +
.../java/org/apache/hadoop/fs/FileSystem.java | 13 +-
.../org/apache/hadoop/fs/ftp/FTPFileSystem.java | 6 +-
.../apache/hadoop/fs/permission/AclEntry.java | 24 +-
.../hadoop/fs/permission/AclEntryScope.java | 2 +-
.../hadoop/fs/permission/AclEntryType.java | 23 +-
.../apache/hadoop/fs/permission/AclStatus.java | 2 +-
.../org/apache/hadoop/fs/shell/AclCommands.java | 6 +-
.../hadoop/fs/shell/CommandWithDestination.java | 5 +-
.../org/apache/hadoop/fs/viewfs/ViewFs.java | 2 +-
.../java/org/apache/hadoop/io/BloomMapFile.java | 11 +-
.../main/java/org/apache/hadoop/io/IOUtils.java | 9 +-
.../main/java/org/apache/hadoop/io/MapFile.java | 10 +-
.../java/org/apache/hadoop/io/SequenceFile.java | 16 +-
.../apache/hadoop/io/compress/BZip2Codec.java | 9 +-
.../apache/hadoop/io/compress/DefaultCodec.java | 9 +-
.../apache/hadoop/io/compress/GzipCodec.java | 9 +-
.../hadoop/io/file/tfile/Compression.java | 14 +-
.../org/apache/hadoop/ipc/ExternalCall.java | 91 +
.../main/java/org/apache/hadoop/ipc/Server.java | 88 +-
.../org/apache/hadoop/net/NetworkTopology.java | 2 +-
.../apache/hadoop/net/SocksSocketFactory.java | 4 +-
.../org/apache/hadoop/security/Credentials.java | 8 +-
.../hadoop/security/KerberosAuthException.java | 118 +
.../hadoop/security/UGIExceptionMessages.java | 46 +
.../hadoop/security/UserGroupInformation.java | 105 +-
.../org/apache/hadoop/security/token/Token.java | 60 +-
.../java/org/apache/hadoop/util/LineReader.java | 6 +-
.../org/apache/hadoop/util/SysInfoWindows.java | 58 +-
.../java/org/apache/hadoop/util/hash/Hash.java | 6 +-
.../src/main/resources/core-default.xml | 6 +-
.../src/site/markdown/FileSystemShell.md | 3 +-
.../src/site/markdown/filesystem/filesystem.md | 77 +-
.../org/apache/hadoop/conf/TestConfServlet.java | 122 +-
.../apache/hadoop/conf/TestConfiguration.java | 140 +-
.../apache/hadoop/fs/FileContextURIBase.java | 4 +-
.../hadoop/fs/TestDFCachingGetSpaceUsed.java | 75 +
.../hadoop/fs/TestDelegationTokenRenewer.java | 3 +-
.../hadoop/fs/TestFileSystemInitialization.java | 12 +-
.../AbstractContractRootDirectoryTest.java | 34 +-
.../fs/contract/AbstractFSContractTestBase.java | 2 +-
.../hadoop/fs/contract/ContractTestUtils.java | 48 +-
.../java/org/apache/hadoop/ipc/TestRPC.java | 85 +
.../org/apache/hadoop/net/ServerSocketUtil.java | 23 +
.../security/TestUserGroupInformation.java | 33 +-
.../apache/hadoop/util/TestSysInfoWindows.java | 7 +-
.../hadoop/crypto/key/kms/server/KMS.java | 76 +-
.../hadoop/crypto/key/kms/server/KMSWebApp.java | 2 +
.../hadoop/crypto/key/kms/server/TestKMS.java | 76 +-
hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 4 +
.../java/org/apache/hadoop/hdfs/DFSClient.java | 9 +-
.../org/apache/hadoop/hdfs/DataStreamer.java | 146 +-
.../hadoop/hdfs/DistributedFileSystem.java | 30 +
.../hdfs/client/CreateEncryptionZoneFlag.java | 70 +
.../apache/hadoop/hdfs/client/HdfsAdmin.java | 536 +
.../apache/hadoop/hdfs/client/HdfsUtils.java | 86 +
.../apache/hadoop/hdfs/client/package-info.java | 27 +
.../server/datanode/DiskBalancerWorkItem.java | 2 +-
.../hdfs/shortcircuit/ShortCircuitCache.java | 88 +-
.../hdfs/web/resources/AclPermissionParam.java | 23 +-
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 1 -
.../jdiff/Apache_Hadoop_HDFS_2.7.2.xml | 21704 +--------
.../src/contrib/bkjournal/README.txt | 66 -
.../dev-support/findbugsExcludeFile.xml | 5 -
.../hadoop-hdfs/src/contrib/bkjournal/pom.xml | 175 -
.../bkjournal/BookKeeperEditLogInputStream.java | 264 -
.../BookKeeperEditLogOutputStream.java | 188 -
.../bkjournal/BookKeeperJournalManager.java | 893 -
.../contrib/bkjournal/CurrentInprogress.java | 160 -
.../bkjournal/EditLogLedgerMetadata.java | 217 -
.../hadoop/contrib/bkjournal/MaxTxId.java | 103 -
.../bkjournal/src/main/proto/bkjournal.proto | 49 -
.../hadoop/contrib/bkjournal/BKJMUtil.java | 184 -
.../bkjournal/TestBookKeeperAsHASharedDir.java | 414 -
.../bkjournal/TestBookKeeperConfiguration.java | 174 -
.../bkjournal/TestBookKeeperEditLogStreams.java | 92 -
.../bkjournal/TestBookKeeperHACheckpoints.java | 109 -
.../bkjournal/TestBookKeeperJournalManager.java | 984 -
.../TestBookKeeperSpeculativeRead.java | 167 -
.../bkjournal/TestBootstrapStandbyWithBKJM.java | 170 -
.../bkjournal/TestCurrentInprogress.java | 160 -
.../hdfs/server/namenode/FSEditLogTestUtil.java | 40 -
.../src/test/resources/log4j.properties | 55 -
.../java/org/apache/hadoop/hdfs/HAUtil.java | 5 +-
.../hdfs/client/CreateEncryptionZoneFlag.java | 71 -
.../apache/hadoop/hdfs/client/HdfsAdmin.java | 524 -
.../apache/hadoop/hdfs/client/HdfsUtils.java | 86 -
.../apache/hadoop/hdfs/client/package-info.java | 27 -
.../block/BlockPoolTokenSecretManager.java | 3 +-
.../token/block/BlockTokenSecretManager.java | 6 +
.../hadoop/hdfs/server/balancer/Dispatcher.java | 2 +-
.../server/blockmanagement/BlockManager.java | 70 +-
.../BlockPlacementPolicyDefault.java | 5 +-
.../hadoop/hdfs/server/datanode/DataNode.java | 5 +
.../hdfs/server/datanode/DiskBalancer.java | 210 +-
.../erasurecode/StripedBlockReader.java | 2 +-
.../datanode/fsdataset/impl/BlockPoolSlice.java | 3 +-
.../datanode/fsdataset/impl/FsDatasetImpl.java | 11 +-
.../datanode/fsdataset/impl/ReplicaMap.java | 41 +-
.../server/diskbalancer/planner/MoveStep.java | 6 +-
.../hdfs/server/namenode/CacheManager.java | 12 +-
.../ContentSummaryComputationContext.java | 94 +-
.../namenode/EncryptionFaultInjector.java | 6 +
.../server/namenode/EncryptionZoneManager.java | 25 +-
.../hadoop/hdfs/server/namenode/FSDirAclOp.java | 4 +-
.../hdfs/server/namenode/FSDirAttrOp.java | 122 +-
.../hdfs/server/namenode/FSDirDeleteOp.java | 67 +-
.../server/namenode/FSDirEncryptionZoneOp.java | 148 +-
.../server/namenode/FSDirErasureCodingOp.java | 2 +-
.../hdfs/server/namenode/FSDirMkdirOp.java | 2 +-
.../hdfs/server/namenode/FSDirRenameOp.java | 200 +-
.../hdfs/server/namenode/FSDirSnapshotOp.java | 22 +-
.../server/namenode/FSDirStatAndListingOp.java | 281 +-
.../hdfs/server/namenode/FSDirSymlinkOp.java | 2 +-
.../hdfs/server/namenode/FSDirWriteFileOp.java | 163 +-
.../hdfs/server/namenode/FSDirXAttrOp.java | 27 +-
.../hdfs/server/namenode/FSDirectory.java | 94 +-
.../hdfs/server/namenode/FSEditLogLoader.java | 94 +-
.../hdfs/server/namenode/FSNamesystem.java | 244 +-
.../hdfs/server/namenode/FSNamesystemLock.java | 187 +-
.../hadoop/hdfs/server/namenode/INode.java | 1 +
.../server/namenode/INodeAttributeProvider.java | 10 +-
.../hdfs/server/namenode/INodeDirectory.java | 11 +-
.../hadoop/hdfs/server/namenode/INodeFile.java | 1 +
.../hadoop/hdfs/server/namenode/INodeId.java | 16 -
.../hdfs/server/namenode/INodeReference.java | 2 +
.../hdfs/server/namenode/INodeSymlink.java | 1 +
.../hdfs/server/namenode/INodesInPath.java | 7 +-
.../hdfs/server/namenode/NamenodeFsck.java | 23 +-
.../hadoop/hdfs/server/namenode/Namesystem.java | 2 +
.../hdfs/server/namenode/XAttrStorage.java | 7 +-
.../ha/RequestHedgingProxyProvider.java | 25 +-
.../snapshot/DirectorySnapshottableFeature.java | 9 +-
.../snapshot/DirectoryWithSnapshotFeature.java | 14 +-
.../hdfs/server/namenode/snapshot/Snapshot.java | 1 +
.../server/protocol/RemoteEditLogManifest.java | 7 +-
.../apache/hadoop/hdfs/tools/CryptoAdmin.java | 51 +-
.../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 2 +-
.../org/apache/hadoop/hdfs/web/JsonUtil.java | 2 +-
.../hadoop-hdfs/src/main/proto/HdfsServer.proto | 2 +-
.../src/main/resources/hdfs-default.xml | 6 +-
.../src/site/markdown/FaultInjectFramework.md | 254 -
.../src/site/markdown/HDFSCommands.md | 8 +-
.../src/site/markdown/HDFSDiskbalancer.md | 5 +-
.../src/site/markdown/HDFSErasureCoding.md | 11 +-
.../markdown/HDFSHighAvailabilityWithNFS.md | 114 -
.../src/site/markdown/TransparentEncryption.md | 16 +
.../hadoop-hdfs/src/site/markdown/ViewFs.md | 2 +-
.../hadoop-hdfs/src/site/markdown/WebHDFS.md | 2 +-
.../hadoop/fs/TestEnhancedByteBufferAccess.java | 17 +-
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 103 +-
.../hadoop/hdfs/TestDFSClientRetries.java | 4 +-
.../org/apache/hadoop/hdfs/TestDFSShell.java | 2021 +-
.../hadoop/hdfs/TestEncryptedTransfer.java | 742 +-
.../apache/hadoop/hdfs/TestEncryptionZones.java | 109 +-
.../apache/hadoop/hdfs/TestFileCorruption.java | 61 +
.../hadoop/hdfs/TestLeaseRecoveryStriped.java | 1 +
.../apache/hadoop/hdfs/TestMiniDFSCluster.java | 119 +
.../hadoop/hdfs/protocolPB/TestPBHelper.java | 30 +-
.../TestPendingInvalidateBlock.java | 37 +-
.../fsdataset/impl/FsDatasetImplTestUtils.java | 2 +-
.../fsdataset/impl/TestDatanodeRestart.java | 13 +-
.../impl/TestInterDatanodeProtocol.java | 3 +-
.../datanode/fsdataset/impl/TestReplicaMap.java | 3 +-
.../fsdataset/impl/TestWriteToReplica.java | 3 +-
.../server/diskbalancer/TestDiskBalancer.java | 156 +
.../server/namenode/TestCacheDirectives.java | 10 +
.../namenode/TestDiskspaceQuotaUpdate.java | 301 +-
.../hdfs/server/namenode/TestFSDirectory.java | 48 +
.../hdfs/server/namenode/TestFSNamesystem.java | 251 -
.../server/namenode/TestFSNamesystemLock.java | 317 +
.../hadoop/hdfs/server/namenode/TestFsck.java | 2403 +-
.../server/namenode/TestNameNodeMXBean.java | 34 +-
.../server/namenode/TestSnapshotPathINodes.java | 22 +
.../server/namenode/ha/TestEditLogTailer.java | 42 +-
.../ha/TestRequestHedgingProxyProvider.java | 18 +-
.../snapshot/TestRenameWithSnapshots.java | 199 +
.../shortcircuit/TestShortCircuitCache.java | 9 +-
.../hadoop/hdfs/web/TestWebHdfsTokens.java | 27 +-
.../apache/hadoop/security/TestPermission.java | 131 +-
.../src/test/resources/testCryptoConf.xml | 90 +
hadoop-hdfs-project/pom.xml | 1 -
.../Apache_Hadoop_MapReduce_Common_2.7.2.xml | 727 +-
.../Apache_Hadoop_MapReduce_Core_2.7.2.xml | 7059 +--
.../Apache_Hadoop_MapReduce_JobClient_2.7.2.xml | 962 +-
.../hadoop/mapreduce/v2/app/MRAppMaster.java | 90 +-
.../mapreduce/v2/app/TaskHeartbeatHandler.java | 24 +-
.../v2/app/rm/RMContainerAllocator.java | 51 +-
.../hadoop/mapreduce/v2/app/TestRecovery.java | 66 +
.../v2/app/TestTaskHeartbeatHandler.java | 67 +
.../v2/app/launcher/TestContainerLauncher.java | 30 +
.../app/launcher/TestContainerLauncherImpl.java | 30 +
.../v2/app/rm/TestRMContainerAllocator.java | 46 +
.../mapreduce/v2/app/webapp/TestAMWebApp.java | 8 +-
.../hadoop-mapreduce-client-core/pom.xml | 6 +-
.../java/org/apache/hadoop/mapred/Master.java | 70 +-
.../java/org/apache/hadoop/mapred/Task.java | 8 +-
.../apache/hadoop/mapreduce/MRJobConfig.java | 11 +-
.../hadoop/mapreduce/util/MRJobConfUtil.java | 16 +
.../src/main/resources/mapred-default.xml | 10 +-
.../org/apache/hadoop/mapred/TestMaster.java | 56 +-
.../mapreduce/v2/hs/HistoryFileManager.java | 21 +
.../hadoop/mapred/ResourceMgrDelegate.java | 6 +
.../apache/hadoop/mapred/JobClientUnitTest.java | 34 +-
.../hadoop-mapreduce-client/pom.xml | 4 +-
.../maven/plugin/cmakebuilder/CompileMojo.java | 4 +-
.../maven/plugin/cmakebuilder/TestMojo.java | 4 +-
.../hadoop/maven/plugin/protoc/ProtocMojo.java | 4 +
.../apache/hadoop/maven/plugin/util/Exec.java | 6 +-
.../plugin/versioninfo/VersionInfoMojo.java | 55 +-
hadoop-project-dist/pom.xml | 21 +-
hadoop-project/pom.xml | 8 +-
hadoop-tools/hadoop-aws/pom.xml | 12 +
.../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 171 +-
.../hadoop/fs/s3a/S3AInstrumentation.java | 10 +
.../java/org/apache/hadoop/fs/s3a/S3AUtils.java | 17 +
.../org/apache/hadoop/fs/s3a/Statistic.java | 4 +
.../src/site/markdown/tools/hadoop-aws/index.md | 42 +-
.../hadoop/fs/s3a/ITestS3AConfiguration.java | 8 +
.../hadoop/fs/s3a/ITestS3AFailureHandling.java | 55 -
.../fs/s3a/ITestS3AFileOperationCost.java | 85 +
.../hadoop/fs/s3a/ITestS3AMiscOperations.java | 63 +
.../org/apache/hadoop/fs/s3a/S3ATestUtils.java | 13 +-
.../fs/s3a/TestS3AExceptionTranslation.java | 127 +
hadoop-tools/hadoop-azure-datalake/pom.xml | 4 +
...ClientCredentialBasedAccesTokenProvider.java | 5 +-
hadoop-tools/hadoop-azure/pom.xml | 6 +-
.../hadoop/fs/azure/NativeAzureFileSystem.java | 16 +-
.../tools/mapred/CopyMapper_Counter.properties | 24 +
.../contract/AbstractContractDistCpTest.java | 2 +-
hadoop-tools/hadoop-kafka/pom.xml | 2 +-
hadoop-tools/hadoop-openstack/pom.xml | 18 +-
.../swift/auth/ApiKeyAuthenticationRequest.java | 2 +-
.../fs/swift/auth/entities/AccessToken.java | 2 +-
.../hadoop/fs/swift/auth/entities/Catalog.java | 2 +-
.../hadoop/fs/swift/auth/entities/Endpoint.java | 2 +-
.../hadoop/fs/swift/auth/entities/Tenant.java | 2 +-
.../hadoop/fs/swift/auth/entities/User.java | 2 +-
.../snative/SwiftNativeFileSystemStore.java | 3 +-
.../apache/hadoop/fs/swift/util/JSONUtil.java | 24 +-
hadoop-tools/hadoop-rumen/pom.xml | 9 +
.../apache/hadoop/tools/rumen/Anonymizer.java | 23 +-
.../hadoop/tools/rumen/HadoopLogsAnalyzer.java | 3 +-
.../tools/rumen/JsonObjectMapperParser.java | 17 +-
.../tools/rumen/JsonObjectMapperWriter.java | 21 +-
.../apache/hadoop/tools/rumen/LoggedJob.java | 2 +-
.../hadoop/tools/rumen/LoggedLocation.java | 2 +-
.../tools/rumen/LoggedNetworkTopology.java | 2 +-
.../rumen/LoggedSingleRelativeRanking.java | 4 +-
.../apache/hadoop/tools/rumen/LoggedTask.java | 2 +-
.../hadoop/tools/rumen/LoggedTaskAttempt.java | 2 +-
.../hadoop/tools/rumen/datatypes/NodeName.java | 2 +-
.../rumen/serializers/BlockingSerializer.java | 10 +-
.../DefaultAnonymizingRumenSerializer.java | 8 +-
.../serializers/DefaultRumenSerializer.java | 9 +-
.../serializers/ObjectStringSerializer.java | 10 +-
.../apache/hadoop/tools/rumen/state/State.java | 2 +-
.../tools/rumen/state/StateDeserializer.java | 14 +-
.../hadoop/tools/rumen/state/StatePool.java | 36 +-
.../hadoop/tools/rumen/TestHistograms.java | 13 +-
hadoop-tools/hadoop-sls/pom.xml | 4 +
.../hadoop/yarn/sls/RumenToSLSConverter.java | 8 +-
.../org/apache/hadoop/yarn/sls/SLSRunner.java | 7 +-
.../apache/hadoop/yarn/sls/utils/SLSUtils.java | 10 +-
.../jdiff/Apache_Hadoop_YARN_API_2.7.2.xml | 530 +-
.../jdiff/Apache_Hadoop_YARN_Client_2.7.2.xml | 613 +-
.../jdiff/Apache_Hadoop_YARN_Common_2.7.2.xml | 1185 +-
.../Apache_Hadoop_YARN_Server_Common_2.7.2.xml | 1056 +-
.../yarn/api/ContainerManagementProtocol.java | 54 +
.../api/protocolrecords/CommitResponse.java | 42 +
.../protocolrecords/KillApplicationRequest.java | 18 +
.../ReInitializeContainerRequest.java | 110 +
.../ReInitializeContainerResponse.java | 38 +
.../RestartContainerResponse.java | 38 +
.../api/protocolrecords/RollbackResponse.java | 42 +
.../records/ApplicationSubmissionContext.java | 21 +
.../api/records/ApplicationTimeoutType.java | 41 +
.../yarn/api/records/ReservationDefinition.java | 44 +-
.../org/apache/hadoop/yarn/api/records/URL.java | 58 +-
.../hadoop/yarn/conf/YarnConfiguration.java | 24 +-
.../ReplaceLabelsOnNodeRequest.java | 8 +
.../proto/containermanagement_protocol.proto | 6 +
..._server_resourcemanager_service_protos.proto | 2 +-
.../src/main/proto/yarn_protos.proto | 11 +
.../src/main/proto/yarn_service_protos.proto | 19 +
.../apache/hadoop/yarn/api/records/TestURL.java | 99 +
.../hadoop/yarn/client/api/YarnClient.java | 14 +
.../yarn/client/api/impl/AMRMClientImpl.java | 10 +-
.../impl/ContainerManagementProtocolProxy.java | 7 +-
.../yarn/client/api/impl/YarnClientImpl.java | 35 +-
.../hadoop/yarn/client/cli/RMAdminCLI.java | 39 +-
.../TestOpportunisticContainerAllocation.java | 398 +
.../yarn/client/api/impl/TestYarnClient.java | 52 +
.../hadoop/yarn/client/cli/TestRMAdminCLI.java | 3 +-
.../hadoop/yarn/client/cli/TestYarnCLI.java | 10 +-
...ContainerManagementProtocolPBClientImpl.java | 73 +
...ontainerManagementProtocolPBServiceImpl.java | 86 +-
.../impl/pb/CommitResponsePBImpl.java | 67 +
.../impl/pb/KillApplicationRequestPBImpl.java | 18 +
.../pb/ReInitializeContainerRequestPBImpl.java | 173 +
.../pb/ReInitializeContainerResponsePBImpl.java | 68 +
.../impl/pb/RestartContainerResponsePBImpl.java | 67 +
.../impl/pb/RollbackResponsePBImpl.java | 67 +
.../pb/ApplicationSubmissionContextPBImpl.java | 83 +
.../records/impl/pb/ContainerStatusPBImpl.java | 2 +
.../yarn/api/records/impl/pb/ProtoUtils.java | 19 +
.../impl/pb/ReservationDefinitionPBImpl.java | 31 +
.../client/api/impl/TimelineClientImpl.java | 3 +-
.../pb/ReplaceLabelsOnNodeRequestPBImpl.java | 14 +-
.../yarn/util/AbstractLivelinessMonitor.java | 32 +-
.../hadoop/yarn/webapp/YarnWebParams.java | 3 +-
.../src/main/resources/yarn-default.xml | 28 +-
.../hadoop/yarn/TestContainerLaunchRPC.java | 30 +
.../yarn/TestContainerResourceIncreaseRPC.java | 30 +
.../hadoop/yarn/api/BasePBImplRecordsTest.java | 264 +
.../hadoop/yarn/api/TestPBImplRecords.java | 269 +-
...pplicationHistoryManagerOnTimelineStore.java | 14 +-
...pplicationHistoryManagerOnTimelineStore.java | 14 +-
.../metrics/ApplicationMetricsConstants.java | 3 +
.../OpportunisticContainerAllocator.java | 22 +-
.../OpportunisticContainerContext.java | 49 +-
.../java/org/apache/hadoop/yarn/TestRPC.java | 30 +
.../yarn/server/nodemanager/NMAuditLogger.java | 4 +
.../yarn/server/nodemanager/NodeManager.java | 3 +-
.../amrmproxy/DefaultRequestInterceptor.java | 4 +-
.../containermanager/ContainerManagerImpl.java | 53 +-
.../container/ContainerImpl.java | 92 +-
.../monitor/ContainersMonitorImpl.java | 31 +-
.../nodemanager/metrics/NodeManagerMetrics.java | 26 +
.../scheduler/DistributedScheduler.java | 59 +-
.../impl/container-executor.c | 46 +-
.../impl/container-executor.h | 10 +-
.../main/native/container-executor/impl/main.c | 264 +-
.../TestContainerManagerWithLCE.java | 12 +
.../containermanager/TestContainerManager.java | 103 +-
.../monitor/TestContainersMonitor.java | 39 +
.../server/resourcemanager/AdminService.java | 46 +
.../server/resourcemanager/ClientRMService.java | 20 +-
...pportunisticContainerAllocatorAMService.java | 215 +-
.../resourcemanager/RMActiveServiceContext.java | 16 +
.../server/resourcemanager/RMAppManager.java | 4 +
.../server/resourcemanager/RMAuditLogger.java | 3 +
.../yarn/server/resourcemanager/RMContext.java | 5 +
.../server/resourcemanager/RMContextImpl.java | 12 +
.../server/resourcemanager/RMServerUtils.java | 21 +-
.../yarn/server/resourcemanager/RMZKUtils.java | 19 +-
.../server/resourcemanager/ResourceManager.java | 23 +-
.../resourcemanager/amlauncher/AMLauncher.java | 21 -
.../metrics/TimelineServiceV1Publisher.java | 6 +
.../metrics/TimelineServiceV2Publisher.java | 5 +
.../recovery/ZKRMStateStore.java | 269 +-
.../server/resourcemanager/rmapp/RMAppImpl.java | 49 +-
.../rmapp/monitor/RMAppLifetimeMonitor.java | 130 +
.../rmapp/monitor/RMAppToMonitor.java | 77 +
.../rmapp/monitor/package-info.java | 28 +
.../scheduler/AbstractYarnScheduler.java | 416 +-
.../scheduler/AppSchedulingInfo.java | 619 +-
.../scheduler/SchedulerApplicationAttempt.java | 66 +-
.../scheduler/capacity/CapacityScheduler.java | 1729 +-
.../scheduler/capacity/LeafQueue.java | 16 +
.../scheduler/common/fica/FiCaSchedulerApp.java | 4 +
.../distributed/NodeQueueLoadMonitor.java | 45 +-
.../scheduler/fair/FSLeafQueue.java | 2 +-
.../scheduler/fair/FSParentQueue.java | 6 +-
.../scheduler/fair/FairScheduler.java | 1047 +-
.../resourcemanager/webapp/ErrorBlock.java | 39 +
.../server/resourcemanager/webapp/RMWebApp.java | 1 +
.../resourcemanager/webapp/RMWebServices.java | 24 +-
.../webapp/RedirectionErrorPage.java | 47 +
.../resourcemanager/webapp/RmController.java | 4 +
.../resourcemanager/webapp/dao/AppState.java | 8 +
.../webapp/dao/ReservationDefinitionInfo.java | 11 +
.../yarn/server/resourcemanager/MockRM.java | 22 +-
.../server/resourcemanager/NodeManager.java | 29 +
.../resourcemanager/TestAMAuthorization.java | 31 +
.../TestApplicationMasterLauncher.java | 30 +
.../resourcemanager/TestClientRMService.java | 7 +-
...pportunisticContainerAllocatorAMService.java | 10 +-
.../resourcemanager/TestRMAdminService.java | 103 +-
.../metrics/TestSystemMetricsPublisher.java | 18 +
.../TestSystemMetricsPublisherForV2.java | 9 +
.../reservation/ReservationSystemTestUtil.java | 10 +-
.../rmapp/TestApplicationLifetimeMonitor.java | 165 +
.../TestRMWebServicesAppsModification.java | 4 +
.../webapp/TestRedirectionErrorPage.java | 68 +
.../yarn/server/webproxy/ProxyUriUtils.java | 53 +-
.../server/webproxy/WebAppProxyServlet.java | 274 +-
.../server/webproxy/amfilter/AmIpFilter.java | 64 +-
.../server/webproxy/TestWebAppProxyServlet.java | 24 +-
.../server/webproxy/amfilter/TestAmFilter.java | 29 +-
.../src/site/markdown/CapacityScheduler.md | 2 +-
.../src/site/markdown/NodeLabel.md | 2 +-
.../src/site/markdown/ReservationSystem.md | 2 +-
.../src/site/markdown/ResourceManagerRest.md | 3 +
.../site/markdown/WritingYarnApplications.md | 6 +-
.../hadoop-yarn-site/src/site/markdown/YARN.md | 6 +-
hadoop-yarn-project/hadoop-yarn/pom.xml | 4 +-
pom.xml | 1 -
407 files changed, 32657 insertions(+), 72369 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a57bba47/hadoop-project/pom.xml
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org