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 ar...@apache.org on 2016/01/29 20:07:41 UTC
[50/50] hadoop git commit: Merge branch 'trunk' into HDFS-1312
Merge branch 'trunk' into HDFS-1312
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a0efd532
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a0efd532
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a0efd532
Branch: refs/heads/HDFS-1312
Commit: a0efd5328eb4dfe2580de764ed5becceed0b225a
Parents: e4e585a c9a09d6
Author: Arpit Agarwal <ar...@apache.org>
Authored: Fri Jan 29 11:06:05 2016 -0800
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Fri Jan 29 11:06:05 2016 -0800
----------------------------------------------------------------------
BUILDING.txt | 2 +-
dev-support/README.md | 57 +
dev-support/bin/releasedocmaker | 18 +
dev-support/bin/shelldocs | 18 +
dev-support/bin/smart-apply-patch | 18 +
dev-support/bin/test-patch | 18 +
dev-support/bin/yetus-wrapper | 176 ++
dev-support/releasedocmaker.py | 580 ----
dev-support/shelldocs.py | 271 --
dev-support/smart-apply-patch.sh | 187 --
dev-support/test-patch.d/checkstyle.sh | 205 --
dev-support/test-patch.d/shellcheck.sh | 178 --
dev-support/test-patch.d/whitespace.sh | 46 -
dev-support/test-patch.sh | 2814 ------------------
.../util/TestZKSignerSecretProvider.java | 2 +-
hadoop-common-project/hadoop-common/CHANGES.txt | 37 +-
hadoop-common-project/hadoop-common/pom.xml | 12 +-
.../fs/CommonConfigurationKeysPublic.java | 3 +
.../org/apache/hadoop/fs/ContentSummary.java | 241 +-
.../java/org/apache/hadoop/fs/FileContext.java | 4 +-
.../java/org/apache/hadoop/fs/FileSystem.java | 7 +
.../java/org/apache/hadoop/fs/QuotaUsage.java | 359 +++
.../apache/hadoop/fs/RawLocalFileSystem.java | 5 +
.../java/org/apache/hadoop/fs/shell/Count.java | 37 +-
.../hadoop/fs/viewfs/ChRootedFileSystem.java | 7 +-
.../apache/hadoop/fs/viewfs/ViewFileSystem.java | 15 +-
.../org/apache/hadoop/ha/SshFenceByTcpPort.java | 4 +-
.../apache/hadoop/io/AbstractMapWritable.java | 54 +-
.../coder/AbstractErasureDecoder.java | 2 +-
.../coder/AbstractHHErasureCodingStep.java | 49 +
.../erasurecode/coder/HHXORErasureDecoder.java | 95 +
.../coder/HHXORErasureDecodingStep.java | 349 +++
.../erasurecode/coder/HHXORErasureEncoder.java | 92 +
.../coder/HHXORErasureEncodingStep.java | 146 +
.../io/erasurecode/coder/util/HHUtil.java | 216 ++
.../metrics2/sink/RollingFileSystemSink.java | 420 +++
.../hadoop/security/ShellBasedIdMapping.java | 9 +-
.../hadoop/security/UserGroupInformation.java | 22 +
.../ZKDelegationTokenSecretManager.java | 2 +-
.../delegation/web/DelegationTokenManager.java | 4 +-
.../org/apache/hadoop/util/JvmPauseMonitor.java | 1 +
.../apache/hadoop/util/ShutdownHookManager.java | 31 +-
.../java/org/apache/hadoop/util/bloom/Key.java | 4 +-
.../src/main/resources/core-default.xml | 8 +-
.../src/site/markdown/FileSystemShell.md | 11 +-
.../org/apache/hadoop/cli/CLITestHelper.java | 2 +-
.../hadoop/crypto/key/TestValueQueue.java | 65 +-
.../apache/hadoop/fs/TestFilterFileSystem.java | 3 +-
.../org/apache/hadoop/fs/TestHarFileSystem.java | 1 +
.../org/apache/hadoop/fs/TestQuotaUsage.java | 146 +
.../org/apache/hadoop/fs/shell/TestCount.java | 109 +-
.../apache/hadoop/ha/TestSshFenceByTcpPort.java | 8 +-
.../erasurecode/coder/TestErasureCoderBase.java | 4 +-
.../coder/TestHHErasureCoderBase.java | 61 +
.../coder/TestHHXORErasureCoder.java | 120 +
.../java/org/apache/hadoop/ipc/TestIPC.java | 18 +-
.../sink/RollingFileSystemSinkTestBase.java | 506 ++++
.../sink/TestRollingFileSystemSink.java | 156 +
.../security/TestUserGroupInformation.java | 48 +-
.../apache/hadoop/test/GenericTestUtils.java | 2 +-
.../hadoop/test/TestTimedOutTestsListener.java | 2 +-
.../src/test/resources/testConf.xml | 2 +-
.../java/org/apache/hadoop/hdfs/DFSClient.java | 122 +-
.../org/apache/hadoop/hdfs/DFSInputStream.java | 82 +-
.../hadoop/hdfs/DFSStripedInputStream.java | 2 +-
.../org/apache/hadoop/hdfs/DFSUtilClient.java | 8 +
.../org/apache/hadoop/hdfs/DataStreamer.java | 3 +-
.../hadoop/hdfs/DistributedFileSystem.java | 28 +
.../hadoop/hdfs/protocol/ClientProtocol.java | 18 +-
.../hdfs/protocol/ReconfigurationProtocol.java | 4 +
.../ClientNamenodeProtocolTranslatorPB.java | 14 +
.../hadoop/hdfs/protocolPB/PBHelperClient.java | 86 +-
.../hadoop/hdfs/util/StripedBlockUtil.java | 13 +-
.../hadoop/hdfs/web/WebHdfsFileSystem.java | 31 +-
.../hdfs/web/resources/DelegationParam.java | 5 +-
.../src/main/proto/ClientNamenodeProtocol.proto | 11 +
.../src/main/proto/hdfs.proto | 11 +
.../src/site/markdown/index.md | 2 +-
.../src/main/native/libhdfs/hdfs.c | 98 +-
.../src/main/native/libhdfs/include/hdfs/hdfs.h | 89 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 66 +-
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 4 +
...tNamenodeProtocolServerSideTranslatorPB.java | 16 +
.../ReconfigurationProtocolServerSideUtils.java | 4 +-
.../server/blockmanagement/BlockIdManager.java | 102 +-
.../server/blockmanagement/BlockManager.java | 109 +-
.../blockmanagement/BlockManagerSafeMode.java | 6 +-
.../blockmanagement/HeartbeatManager.java | 1 +
.../OutOfLegacyGenerationStampsException.java | 38 +
.../OutOfV1GenerationStampsException.java | 38 -
.../hdfs/server/common/HdfsServerConstants.java | 3 +-
.../hadoop/hdfs/server/common/Storage.java | 3 +-
.../server/datanode/BlockPoolSliceStorage.java | 131 +-
.../hdfs/server/datanode/BlockReceiver.java | 29 +-
.../hdfs/server/datanode/DataStorage.java | 282 +-
.../hdfs/server/datanode/DirectoryScanner.java | 72 +-
.../hdfs/server/datanode/StorageLocation.java | 15 +
.../erasurecode/ErasureCodingWorker.java | 146 +-
.../hdfs/server/namenode/FSDirAppendOp.java | 15 +-
.../server/namenode/FSDirStatAndListingOp.java | 53 +
.../hdfs/server/namenode/FSDirTruncateOp.java | 2 +-
.../hdfs/server/namenode/FSDirWriteFileOp.java | 15 +-
.../hdfs/server/namenode/FSDirectory.java | 4 +
.../hadoop/hdfs/server/namenode/FSEditLog.java | 4 +-
.../hdfs/server/namenode/FSEditLogLoader.java | 19 +-
.../hdfs/server/namenode/FSImageFormat.java | 27 +-
.../server/namenode/FSImageFormatProtobuf.java | 16 +-
.../hdfs/server/namenode/FSNamesystem.java | 168 +-
.../hadoop/hdfs/server/namenode/INodeFile.java | 56 +-
.../hdfs/server/namenode/LeaseManager.java | 17 +-
.../hadoop/hdfs/server/namenode/NameNode.java | 12 +-
.../hdfs/server/namenode/NameNodeRpcServer.java | 44 +-
.../hadoop/hdfs/server/namenode/Namesystem.java | 11 -
.../server/protocol/BlockECRecoveryCommand.java | 2 +-
.../hdfs/server/protocol/NamenodeProtocols.java | 2 +
.../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 256 +-
.../hadoop-hdfs/src/main/proto/fsimage.proto | 4 +-
.../fs/viewfs/TestViewFsDefaultValue.java | 53 +-
.../hadoop/hdfs/TestDFSClientRetries.java | 36 +-
.../org/apache/hadoop/hdfs/TestFileAppend.java | 56 +-
.../apache/hadoop/hdfs/TestLeaseRecovery2.java | 48 +-
.../java/org/apache/hadoop/hdfs/TestQuota.java | 66 +-
.../hdfs/TestReadStripedFileWithDecoding.java | 17 +-
.../hadoop/hdfs/TestRecoverStripedFile.java | 172 +-
.../org/apache/hadoop/hdfs/TestReplication.java | 3 +-
.../hadoop/hdfs/TestSetrepIncreasing.java | 19 +
.../apache/hadoop/hdfs/UpgradeUtilities.java | 2 +-
.../blockmanagement/TestBlockManager.java | 2 +-
.../TestBlockManagerSafeMode.java | 6 +-
.../TestPendingInvalidateBlock.java | 19 +
.../blockmanagement/TestReplicationPolicy.java | 6 +-
.../TestSequentialBlockGroupId.java | 12 +-
.../blockmanagement/TestSequentialBlockId.java | 22 +-
.../server/datanode/SimulatedFSDataset.java | 2 +-
.../datanode/TestDataNodeHotSwapVolumes.java | 48 +-
.../hdfs/server/datanode/TestDataStorage.java | 7 +-
.../server/datanode/TestDirectoryScanner.java | 50 +
.../fsdataset/impl/TestFsDatasetImpl.java | 2 +-
.../server/namenode/NNThroughputBenchmark.java | 34 +-
.../hdfs/server/namenode/TestEditLog.java | 6 +-
.../server/namenode/TestFSEditLogLoader.java | 23 +-
.../hdfs/server/namenode/TestFSImage.java | 4 +-
.../hdfs/server/namenode/TestFileTruncate.java | 4 +-
.../hdfs/server/namenode/TestINodeFile.java | 6 +-
.../hdfs/server/namenode/TestLeaseManager.java | 4 +-
.../hdfs/server/namenode/TestSaveNamespace.java | 6 +-
.../server/namenode/ha/TestQuotasWithHA.java | 14 +-
.../apache/hadoop/hdfs/tools/TestDFSAdmin.java | 162 +-
.../hadoop/hdfs/web/TestWebHdfsTimeouts.java | 14 +-
.../apache/hadoop/hdfs/web/TestWebHdfsUrl.java | 5 +-
hadoop-mapreduce-project/CHANGES.txt | 23 +-
.../dev-support/findbugs-exclude.xml | 2 +
.../jobhistory/JobHistoryEventHandler.java | 18 +-
.../v2/jobhistory/FileNameIndexUtils.java | 171 +-
.../org/apache/hadoop/mapred/TestJobClient.java | 10 +
.../v2/jobhistory/TestFileNameIndexUtils.java | 199 +-
.../org/apache/hadoop/mapred/JobClient.java | 3 +-
.../src/main/resources/mapred-default.xml | 24 +
hadoop-project/pom.xml | 5 -
.../gridmix/DistributedCacheEmulator.java | 4 +-
.../hadoop/mapred/gridmix/CommonJobTest.java | 2 +-
.../mapred/gridmix/TestPseudoLocalFs.java | 2 +-
.../apache/hadoop/tools/rumen/JobBuilder.java | 11 +-
.../src/main/data/2jobs2min-rumen-jh.json | 606 ++++
.../org/apache/hadoop/yarn/sls/SLSRunner.java | 6 +
.../apache/hadoop/yarn/sls/utils/SLSUtils.java | 17 +-
.../yarn/sls/nodemanager/TestNMSimulator.java | 2 +-
.../hadoop/yarn/sls/utils/TestSLSUtils.java | 5 +
.../src/site/markdown/HadoopStreaming.md.vm | 6 +-
.../apache/hadoop/streaming/DelayEchoApp.java | 2 +-
hadoop-yarn-project/CHANGES.txt | 92 +-
.../dev-support/findbugs-exclude.xml | 5 +
.../hadoop/yarn/conf/YarnConfiguration.java | 19 +
.../src/main/proto/yarn_service_protos.proto | 7 -
.../yarn/conf/TestYarnConfigurationFields.java | 2 +
.../hadoop/yarn/client/cli/ApplicationCLI.java | 61 +-
...stHedgingRequestRMFailoverProxyProvider.java | 98 +
.../api/impl/TestAMRMClientOnRMRestart.java | 1 +
.../hadoop/yarn/client/cli/TestYarnCLI.java | 143 +-
.../ConfiguredRMFailoverProxyProvider.java | 6 +-
.../org/apache/hadoop/yarn/client/RMProxy.java | 33 +-
.../RequestHedgingRMFailoverProxyProvider.java | 194 ++
.../src/main/resources/yarn-default.xml | 8 +
.../timeline/KeyValueBasedTimelineStore.java | 574 ++++
.../server/timeline/MemoryTimelineStore.java | 491 +--
.../timeline/TimelineStoreMapAdapter.java | 60 +
.../yarn/server/timeline/util/LeveldbUtils.java | 7 +
.../pb/RegisterNodeManagerRequestPBImpl.java | 75 +-
.../nodemanager/LinuxContainerExecutor.java | 32 +-
.../containermanager/ContainerManagerImpl.java | 6 +
.../container/ContainerImpl.java | 1 +
.../launcher/ContainerLaunch.java | 11 +
.../launcher/RecoveredContainerLaunch.java | 7 +-
.../CGroupsCpuResourceHandlerImpl.java | 235 ++
.../linux/resources/CGroupsHandler.java | 4 +
.../linux/resources/CpuResourceHandler.java | 32 +
.../linux/resources/ResourceHandlerModule.java | 34 +
.../runtime/DockerLinuxContainerRuntime.java | 10 +-
.../runtime/LinuxContainerRuntimeConstants.java | 4 +
.../executor/ContainerStartContext.java | 24 +
.../util/CgroupsLCEResourcesHandler.java | 68 +-
.../util/DefaultLCEResourcesHandler.java | 1 +
.../nodemanager/util/LCEResourcesHandler.java | 1 +
.../nodemanager/TestLinuxContainerExecutor.java | 9 +
.../nodemanager/TestNodeStatusUpdater.java | 16 +-
.../TestCGroupsCpuResourceHandlerImpl.java | 297 ++
.../runtime/TestDockerContainerRuntime.java | 12 +-
.../util/TestCgroupsLCEResourcesHandler.java | 1 +
.../server/resourcemanager/ClientRMService.java | 6 +-
.../resourcemanager/LeaderElectorService.java | 23 +-
.../server/resourcemanager/RMServerUtils.java | 76 +-
.../server/resourcemanager/ResourceManager.java | 98 +-
.../resourcemanager/recovery/RMStateStore.java | 2 +-
.../recovery/ZKRMStateStore.java | 111 +-
.../server/resourcemanager/rmapp/RMAppImpl.java | 49 +-
.../rmapp/attempt/RMAppAttemptImpl.java | 18 +-
.../scheduler/AbstractYarnScheduler.java | 64 +-
.../scheduler/AppSchedulingInfo.java | 32 +-
.../scheduler/SchedContainerChangeRequest.java | 33 +-
.../scheduler/capacity/CSQueue.java | 3 +-
.../scheduler/capacity/CapacityScheduler.java | 119 +-
.../scheduler/capacity/LeafQueue.java | 89 +-
.../scheduler/capacity/ParentQueue.java | 4 +-
.../capacity/PartitionedQueueComparator.java | 10 +-
.../scheduler/fair/AllocationConfiguration.java | 11 +-
.../fair/AllocationFileLoaderService.java | 16 +-
.../scheduler/fair/FSParentQueue.java | 8 +
.../resourcemanager/scheduler/fair/FSQueue.java | 11 +-
.../scheduler/fair/FairScheduler.java | 3 +-
.../webapp/FairSchedulerPage.java | 1 +
.../webapp/dao/FairSchedulerQueueInfo.java | 7 +
.../resourcemanager/TestClientRMService.java | 7 +-
.../server/resourcemanager/TestRMRestart.java | 120 +
.../recovery/TestZKRMStateStore.java | 1 +
.../recovery/TestZKRMStateStorePerf.java | 2 +
.../TestZKRMStateStoreZKClientConnections.java | 22 +-
.../rmapp/TestRMAppTransitions.java | 9 +-
.../attempt/TestRMAppAttemptTransitions.java | 13 +
.../capacity/TestApplicationPriority.java | 1 -
.../capacity/TestContainerResizing.java | 87 +
.../TestNodeLabelContainerAllocation.java | 77 +-
.../scheduler/capacity/TestReservations.java | 147 +-
.../scheduler/fair/TestFairScheduler.java | 327 ++
.../hadoop/yarn/server/MiniYARNCluster.java | 1 +
.../pom.xml | 4 +
.../yarn/server/timeline/EntityCacheItem.java | 3 +-
.../timeline/LevelDBCacheTimelineStore.java | 316 ++
.../server/timeline/PluginStoreTestUtils.java | 2 +-
.../timeline/TestLevelDBCacheTimelineStore.java | 94 +
.../src/site/markdown/CapacityScheduler.md | 71 +-
.../site/markdown/WritingYarnApplications.md | 8 +-
251 files changed, 10732 insertions(+), 6611 deletions(-)
----------------------------------------------------------------------