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 zj...@apache.org on 2015/01/27 19:41:08 UTC
[50/50] [abbrv] hadoop git commit: Merge remote-tracking branch
'apache/trunk' into YARN-2928
Merge remote-tracking branch 'apache/trunk' into YARN-2928
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3cd9e8dd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3cd9e8dd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3cd9e8dd
Branch: refs/heads/YARN-2928
Commit: 3cd9e8dd1c19f3d4c157c38426930d94732e51fe
Parents: 630f1cd f56da3c
Author: Zhijie Shen <zj...@apache.org>
Authored: Tue Jan 27 10:32:39 2015 -0800
Committer: Zhijie Shen <zj...@apache.org>
Committed: Tue Jan 27 10:32:39 2015 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 70 +-
.../org/apache/hadoop/conf/Configuration.java | 46 +-
.../crypto/key/kms/KMSClientProvider.java | 31 +-
.../hadoop/crypto/key/kms/ValueQueue.java | 12 +-
.../apache/hadoop/fs/ChecksumFileSystem.java | 5 +
.../java/org/apache/hadoop/fs/FileSystem.java | 23 +
.../org/apache/hadoop/fs/FilterFileSystem.java | 5 +
.../org/apache/hadoop/fs/HarFileSystem.java | 8 +
.../apache/hadoop/fs/RawLocalFileSystem.java | 25 +
.../org/apache/hadoop/fs/shell/FsCommand.java | 1 +
.../org/apache/hadoop/fs/shell/Truncate.java | 117 +++
.../apache/hadoop/fs/viewfs/ViewFileSystem.java | 13 +
.../apache/hadoop/ha/ZKFailoverController.java | 4 +-
.../apache/hadoop/io/FastByteComparisons.java | 21 +-
.../main/java/org/apache/hadoop/ipc/Client.java | 6 +
.../main/java/org/apache/hadoop/ipc/RPC.java | 9 +-
.../metrics2/impl/MetricsCollectorImpl.java | 3 +-
.../apache/hadoop/net/SocketIOWithTimeout.java | 12 +-
.../hadoop/security/SaslPropertiesResolver.java | 3 +-
.../hadoop/util/ApplicationClassLoader.java | 6 +-
.../hadoop/util/GenericOptionsParser.java | 20 +-
.../apache/hadoop/util/bloom/BloomFilter.java | 2 +-
.../src/main/resources/core-default.xml | 24 +
.../src/site/apt/SecureMode.apt.vm | 53 +-
.../src/site/apt/Superusers.apt.vm | 74 +-
.../hadoop-common/src/site/apt/Tracing.apt.vm | 25 +-
.../apache/hadoop/conf/TestConfiguration.java | 46 +
.../org/apache/hadoop/ha/MiniZKFCCluster.java | 9 +-
.../hadoop/ha/TestZKFailoverController.java | 10 +-
.../apache/hadoop/ipc/TestRPCWaitForProxy.java | 130 +++
.../hadoop/util/bloom/TestBloomFilters.java | 11 +
.../hadoop-kms/src/main/conf/kms-acls.xml | 2 +-
.../hadoop-kms/src/site/apt/index.apt.vm | 6 +-
.../hadoop/crypto/key/kms/server/TestKMS.java | 7 +
.../test/resources/mini-kms-acls-default.xml | 4 +-
hadoop-common-project/hadoop-nfs/pom.xml | 5 -
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 2 +-
.../src/site/apt/index.apt.vm | 2 +-
.../hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 53 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 90 +-
.../java/org/apache/hadoop/hdfs/DFSClient.java | 4 +
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 2 +
.../hadoop/hdfs/DistributedFileSystem.java | 9 +-
.../hdfs/server/datanode/BPOfferService.java | 3 -
.../hdfs/server/datanode/BPServiceActor.java | 6 -
.../server/datanode/BlockMetadataHeader.java | 2 +-
.../server/datanode/BlockPoolSliceScanner.java | 833 -------------------
.../hdfs/server/datanode/BlockReceiver.java | 67 +-
.../hdfs/server/datanode/BlockScanner.java | 308 +++++++
.../hdfs/server/datanode/BlockSender.java | 10 +
.../hdfs/server/datanode/ChunkChecksum.java | 4 +-
.../hdfs/server/datanode/DataBlockScanner.java | 328 --------
.../hadoop/hdfs/server/datanode/DataNode.java | 73 +-
.../hdfs/server/datanode/DataStorage.java | 35 +-
.../hdfs/server/datanode/ReplicaHandler.java | 49 ++
.../hdfs/server/datanode/VolumeScanner.java | 652 +++++++++++++++
.../server/datanode/fsdataset/FsDatasetSpi.java | 47 +-
.../datanode/fsdataset/FsVolumeReference.java | 48 ++
.../server/datanode/fsdataset/FsVolumeSpi.java | 120 +++
.../datanode/fsdataset/ReplicaInputStreams.java | 6 +-
.../server/datanode/fsdataset/RollingLogs.java | 73 --
.../impl/FsDatasetAsyncDiskService.java | 16 +-
.../datanode/fsdataset/impl/FsDatasetImpl.java | 344 ++++----
.../datanode/fsdataset/impl/FsVolumeImpl.java | 468 ++++++++++-
.../datanode/fsdataset/impl/FsVolumeList.java | 108 ++-
.../impl/RamDiskAsyncLazyPersistService.java | 24 +-
.../fsdataset/impl/RollingLogsImpl.java | 241 ------
.../hdfs/server/namenode/FSDirDeleteOp.java | 246 ++++++
.../hdfs/server/namenode/FSDirRenameOp.java | 5 +-
.../hdfs/server/namenode/FSDirectory.java | 138 +--
.../hdfs/server/namenode/FSEditLogLoader.java | 6 +-
.../hadoop/hdfs/server/namenode/FSImage.java | 56 +-
.../hdfs/server/namenode/FSNamesystem.java | 164 ++--
.../hadoop/hdfs/server/namenode/INodeFile.java | 2 +-
.../hdfs/server/namenode/ImageServlet.java | 18 +-
.../hadoop/hdfs/server/namenode/NameNode.java | 12 +-
.../hdfs/server/namenode/NameNodeRpcServer.java | 187 ++++-
.../hdfs/server/protocol/DatanodeStorage.java | 19 +-
.../hadoop/hdfs/web/WebHdfsFileSystem.java | 20 +-
.../src/main/proto/datatransfer.proto | 2 +-
.../src/main/resources/hdfs-default.xml | 20 +
.../src/site/apt/ArchivalStorage.apt.vm | 22 +-
.../hadoop-hdfs/src/site/apt/Federation.apt.vm | 207 +++--
.../org/apache/hadoop/hdfs/DFSTestUtil.java | 16 +
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 29 +-
.../hadoop/hdfs/TestBlockReaderLocal.java | 4 +-
.../hadoop/hdfs/TestDFSUpgradeFromImage.java | 19 +-
.../hadoop/hdfs/TestDatanodeBlockScanner.java | 496 -----------
.../hadoop/hdfs/TestDatanodeLayoutUpgrade.java | 2 +-
...estDatanodeStartupFixesLegacyStorageIDs.java | 139 ++++
.../hadoop/hdfs/TestMissingBlocksAlert.java | 5 +-
.../org/apache/hadoop/hdfs/TestReplication.java | 5 +-
.../hdfs/TestWriteBlockGetsBlockLengthHint.java | 2 +-
.../apache/hadoop/hdfs/UpgradeUtilities.java | 2 +-
.../TestBlocksWithNotEnoughRacks.java | 2 +-
.../TestOverReplicatedBlocks.java | 15 +-
.../server/datanode/BlockReportTestBase.java | 7 +-
.../hdfs/server/datanode/DataNodeTestUtils.java | 24 -
.../server/datanode/SimulatedFSDataset.java | 61 +-
.../hdfs/server/datanode/TestBlockRecovery.java | 2 +-
.../hdfs/server/datanode/TestBlockScanner.java | 680 +++++++++++++++
.../server/datanode/TestCachingStrategy.java | 8 +-
.../datanode/TestDataNodeHotSwapVolumes.java | 33 +-
.../server/datanode/TestDirectoryScanner.java | 25 +-
.../TestMultipleNNDataBlockScanner.java | 245 ------
.../server/datanode/TestSimulatedFSDataset.java | 2 +-
.../extdataset/ExternalDatasetImpl.java | 402 +++++++++
.../datanode/extdataset/ExternalReplica.java | 65 ++
.../extdataset/ExternalReplicaInPipeline.java | 97 +++
.../datanode/extdataset/ExternalVolumeImpl.java | 99 +++
.../extdataset/TestExternalDataset.java | 88 ++
.../fsdataset/impl/FsVolumeListTest.java | 101 +++
.../fsdataset/impl/TestFsDatasetImpl.java | 74 +-
.../impl/TestInterDatanodeProtocol.java | 4 +-
.../fsdataset/impl/TestLazyPersistFiles.java | 26 +-
.../fsdataset/impl/TestScrLazyPersistFiles.java | 10 +-
.../fsdataset/impl/TestWriteToReplica.java | 12 +-
.../hdfs/server/namenode/TestFileTruncate.java | 83 ++
.../hadoop/hdfs/server/namenode/TestFsck.java | 15 +-
.../namenode/TestProcessCorruptBlocks.java | 4 +-
.../ha/TestPendingCorruptDnMessages.java | 2 +-
.../namenode/ha/TestStandbyCheckpoints.java | 2 +-
.../namenode/snapshot/SnapshotTestHelper.java | 4 +-
.../shortcircuit/TestShortCircuitLocalRead.java | 2 +-
.../hdfs/web/TestFSMainOperationsWebHdfs.java | 49 ++
.../testUpgradeFrom22FixesStorageIDs.tgz | Bin 0 -> 3260 bytes
.../testUpgradeFrom22FixesStorageIDs.txt | 25 +
.../testUpgradeFrom22via26FixesStorageIDs.tgz | Bin 0 -> 3635 bytes
.../testUpgradeFrom22via26FixesStorageIDs.txt | 25 +
.../testUpgradeFrom26PreservesStorageIDs.tgz | Bin 0 -> 3852 bytes
.../testUpgradeFrom26PreservesStorageIDs.txt | 25 +
hadoop-mapreduce-project/CHANGES.txt | 7 +
hadoop-mapreduce-project/bin/mapred | 4 +-
hadoop-mapreduce-project/bin/mapred.cmd | 10 +-
.../apache/hadoop/mapred/MapReduceChildJVM.java | 32 +-
.../v2/app/job/impl/TaskAttemptImpl.java | 15 +-
.../v2/app/job/impl/TestMapReduceChildJVM.java | 93 ++-
.../mapreduce/v2/jobhistory/JHAdminConfig.java | 7 +
.../java/org/apache/hadoop/mapred/JobConf.java | 129 ++-
.../java/org/apache/hadoop/mapred/Task.java | 6 +-
.../apache/hadoop/mapreduce/MRJobConfig.java | 5 +
.../src/main/resources/mapred-default.xml | 46 +-
.../hadoop-mapreduce-client-hs/pom.xml | 4 +
.../HistoryServerLeveldbStateStoreService.java | 379 +++++++++
.../src/site/resources/css/site.css | 30 +
...stHistoryServerLeveldbStateStoreService.java | 207 +++++
.../src/main/native/src/lib/primitives.h | 8 +
.../src/main/native/src/util/Checksum.cc | 5 +
hadoop-maven-plugins/pom.xml | 19 +-
.../hadoop/maven/plugin/protoc/ProtocMojo.java | 7 +-
.../hadoop/maven/plugin/util/FileSetUtils.java | 2 +-
.../plugin/versioninfo/VersionInfoMojo.java | 3 +-
hadoop-project/src/site/site.xml | 2 +-
.../hadoop/fs/s3/Jets3tFileSystemStore.java | 2 +-
.../org/apache/hadoop/fs/s3a/Constants.java | 7 +
.../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 45 +-
.../hadoop/fs/s3a/TestS3AConfiguration.java | 95 +++
.../java/org/apache/hadoop/tools/DistCpV1.java | 152 ++--
.../src/site/resources/css/site.css | 30 +
.../src/site/resources/css/site.css | 30 +
hadoop-yarn-project/CHANGES.txt | 41 +
hadoop-yarn-project/hadoop-yarn/bin/yarn | 4 +-
hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd | 11 +-
.../hadoop/yarn/conf/YarnConfiguration.java | 35 +-
.../distributedshell/TestDistributedShell.java | 1 +
.../hadoop/yarn/client/cli/TestRMAdminCLI.java | 26 +-
...RegisterApplicationMasterResponsePBImpl.java | 3 +-
.../yarn/logaggregation/LogCLIHelpers.java | 4 +-
.../nodelabels/CommonNodeLabelsManager.java | 42 +-
.../nodelabels/TestCommonNodeLabelsManager.java | 62 +-
.../TestFileSystemNodeLabelsStore.java | 1 +
.../hadoop-yarn-server-common/pom.xml | 6 +
.../impl/pb/NodeHeartbeatResponsePBImpl.java | 3 +-
.../nodemanager/LinuxContainerExecutor.java | 9 +-
.../localizer/ResourceLocalizationService.java | 99 +--
.../monitor/ContainerMetrics.java | 172 ++++
.../monitor/ContainersMonitorImpl.java | 22 +-
.../TestLinuxContainerExecutorWithMocks.java | 49 +-
.../nodemanager/TestNodeStatusUpdater.java | 63 ++
.../TestResourceLocalizationService.java | 71 +-
.../monitor/TestContainerMetrics.java | 74 ++
.../server/resourcemanager/ResourceManager.java | 6 +-
.../ProportionalCapacityPreemptionPolicy.java | 53 +-
.../nodelabels/MemoryRMNodeLabelsManager.java | 82 --
.../scheduler/ResourceUsage.java | 332 ++++++++
.../yarn/server/resourcemanager/MockRM.java | 4 +-
.../server/resourcemanager/TestRMRestart.java | 1 +
...estProportionalCapacityPreemptionPolicy.java | 106 ++-
.../nodelabels/NullRMNodeLabelsManager.java | 90 ++
.../nodelabels/TestRMNodeLabelsManager.java | 9 +-
.../scheduler/TestResourceUsage.java | 138 +++
.../capacity/TestCapacityScheduler.java | 6 +-
.../TestCapacitySchedulerNodeLabelUpdate.java | 4 +-
.../capacity/TestContainerAllocation.java | 6 +-
.../scheduler/capacity/TestQueueParsing.java | 12 +-
.../resourcemanager/webapp/TestRMWebApp.java | 6 +-
.../hadoop/yarn/server/MiniYARNCluster.java | 6 +-
.../src/site/apt/FairScheduler.apt.vm | 2 +-
pom.xml | 6 +-
199 files changed, 8344 insertions(+), 3740 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3cd9e8dd/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------