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 sz...@apache.org on 2014/09/19 01:14:43 UTC
[06/50] git commit: Merge r1609845 through r1618763 from trunk.
Merge r1609845 through r1618763 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1618764 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4e324bcd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4e324bcd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4e324bcd
Branch: refs/heads/trunk
Commit: 4e324bcd3df4762a79c227c0a7e057a2d75c318c
Parents: 5d5aae0 2fb04d2
Author: Tsz-wo Sze <sz...@apache.org>
Authored: Mon Aug 18 23:41:53 2014 +0000
Committer: Tsz-wo Sze <sz...@apache.org>
Committed: Mon Aug 18 23:41:53 2014 +0000
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 22 ++
.../org/apache/hadoop/conf/Configuration.java | 5 +-
.../hadoop/fs/CommonConfigurationKeys.java | 3 +
.../apache/hadoop/ipc/metrics/RpcMetrics.java | 8 +-
.../hadoop/security/WhitelistBasedResolver.java | 149 ++++++++++++
.../authorize/ServiceAuthorizationManager.java | 38 ++-
.../org/apache/hadoop/util/CacheableIPList.java | 76 ++++++
.../apache/hadoop/util/CombinedIPWhiteList.java | 60 +++++
.../org/apache/hadoop/util/DataChecksum.java | 14 +-
.../org/apache/hadoop/util/FileBasedIPList.java | 102 ++++++++
.../java/org/apache/hadoop/util/IPList.java | 33 +++
.../org/apache/hadoop/util/MachineList.java | 13 +-
.../org/apache/hadoop/util/NativeCrc32.java | 33 ++-
.../src/org/apache/hadoop/util/NativeCrc32.c | 30 +--
.../src/org/apache/hadoop/util/bulk_crc32.c | 60 ++---
.../src/org/apache/hadoop/util/bulk_crc32.h | 49 ++--
.../org/apache/hadoop/util/test_bulk_crc32.c | 6 +-
.../src/site/apt/NativeLibraries.apt.vm | 8 +-
.../src/site/apt/ServiceLevelAuth.apt.vm | 21 ++
.../java/org/apache/hadoop/ipc/TestRPC.java | 8 +-
.../security/TestWhitelistBasedResolver.java | 163 +++++++++++++
.../authorize/TestServiceAuthorization.java | 117 +++++++++
.../apache/hadoop/util/TestCacheableIPList.java | 188 +++++++++++++++
.../apache/hadoop/util/TestDataChecksum.java | 154 ++++++++----
.../apache/hadoop/util/TestFileBasedIPList.java | 215 +++++++++++++++++
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 9 +
.../WhitelistBasedTrustedChannelResolver.java | 119 +++++++++
.../BlockInfoUnderConstruction.java | 12 +-
.../CacheReplicationMonitor.java | 22 +-
.../hdfs/server/datanode/BlockReceiver.java | 13 +-
.../hadoop/hdfs/server/datanode/DataNode.java | 11 +-
.../hdfs/server/datanode/DataXceiver.java | 13 +-
.../hdfs/server/datanode/DataXceiverServer.java | 33 ++-
.../hdfs/server/namenode/FSNamesystem.java | 50 +++-
.../hdfs/server/namenode/INodeDirectory.java | 2 +-
.../org/apache/hadoop/hdfs/DFSTestUtil.java | 32 +++
.../datanode/TestDataNodeRollingUpgrade.java | 48 ++++
.../TestCommitBlockSynchronization.java | 11 +
.../hdfs/server/namenode/TestDeleteRace.java | 133 ++++++++++
.../namenode/ha/TestPipelinesFailover.java | 34 +--
hadoop-mapreduce-project/CHANGES.txt | 12 +
.../mapreduce/v2/app/job/impl/JobImpl.java | 30 ++-
.../mapreduce/v2/app/TestJobEndNotifier.java | 3 +-
.../mapreduce/v2/app/job/impl/TestJobImpl.java | 10 +-
.../apache/hadoop/mapreduce/MRJobConfig.java | 8 +
.../mapreduce/lib/db/OracleDBRecordReader.java | 7 +-
.../hadoop/mapreduce/task/reduce/Fetcher.java | 2 +
.../task/reduce/ShuffleSchedulerImpl.java | 34 ++-
.../hadoop/mapreduce/lib/db/TestDbClasses.java | 2 +-
hadoop-yarn-project/CHANGES.txt | 3 +
.../conf/capacity-scheduler.xml | 23 ++
.../scheduler/capacity/CapacityScheduler.java | 121 +++++++++-
.../CapacitySchedulerConfiguration.java | 119 ++++++++-
.../scheduler/capacity/TestQueueMappings.java | 240 +++++++++++++++++++
54 files changed, 2442 insertions(+), 289 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e324bcd/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e324bcd/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/4e324bcd/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e324bcd/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeleteRace.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeleteRace.java
index b0e704a,4cdd809..b0f6b6a
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeleteRace.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeleteRace.java
@@@ -27,19 -29,30 +29,30 @@@ import org.apache.hadoop.conf.Configura
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.BlockStoragePolicy;
+ import org.apache.hadoop.hdfs.AppendTestUtil;
import org.apache.hadoop.hdfs.DFSConfigKeys;
+ import org.apache.hadoop.hdfs.DFSTestUtil;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.HdfsConfiguration;
import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.hdfs.StorageType;
+ import org.apache.hadoop.hdfs.protocol.DatanodeID;
+ import org.apache.hadoop.hdfs.protocol.ExtendedBlock;
+ import org.apache.hadoop.hdfs.protocolPB.DatanodeProtocolClientSideTranslatorPB;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockPlacementPolicy;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockPlacementPolicyDefault;
+ import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor;
import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeStorageInfo;
+ import org.apache.hadoop.hdfs.server.datanode.DataNode;
+ import org.apache.hadoop.hdfs.server.datanode.DataNodeTestUtils;
import org.apache.hadoop.hdfs.server.namenode.snapshot.SnapshotTestHelper;
+ import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.net.Node;
import org.apache.hadoop.test.GenericTestUtils;
+ import org.apache.hadoop.test.GenericTestUtils.DelayAnswer;
import org.junit.Assert;
import org.junit.Test;
+ import org.mockito.Mockito;
import org.mockito.internal.util.reflection.Whitebox;