hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [46/46] hadoop git commit: Merge remote-tracking branch 'apache-commit/trunk' into HDFS-7240
Date Wed, 01 Jul 2015 21:10:32 GMT
Merge remote-tracking branch 'apache-commit/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/6551e11c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6551e11c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6551e11c

Branch: refs/heads/HDFS-7240
Commit: 6551e11c0e6c3fa870a1560aef8699f088c0b190
Parents: 71dfa13 eac1d18
Author: Arpit Agarwal <arp@apache.org>
Authored: Wed Jul 1 14:09:14 2015 -0700
Committer: Arpit Agarwal <arp@apache.org>
Committed: Wed Jul 1 14:09:14 2015 -0700

----------------------------------------------------------------------
 dev-support/releasedocmaker.py                  |  76 +++-
 dev-support/test-patch.sh                       |   4 +-
 hadoop-common-project/hadoop-common/CHANGES.txt |  53 +++
 .../java/org/apache/hadoop/fs/FileSystem.java   | 146 +++++---
 .../java/org/apache/hadoop/fs/FileUtil.java     |  42 +++
 .../main/java/org/apache/hadoop/fs/FsShell.java |  16 +-
 .../main/java/org/apache/hadoop/fs/Globber.java |  11 +-
 .../java/org/apache/hadoop/fs/shell/Delete.java |  17 +-
 .../main/java/org/apache/hadoop/util/Shell.java |   6 +-
 .../org/apache/hadoop/io/nativeio/NativeIO.c    |   1 +
 .../org/apache/hadoop/net/unix/DomainSocket.c   |   8 +-
 .../src/org/apache/hadoop/util/NativeCrc32.c    |   4 +-
 ...yptoStreamsWithOpensslAesCtrCryptoCodec.java |   9 +-
 .../apache/hadoop/fs/FCStatisticsBaseTest.java  |  56 ++-
 .../java/org/apache/hadoop/fs/TestFileUtil.java | 112 +++++-
 .../apache/hadoop/fs/TestFsShellReturnCode.java |  60 ++-
 .../java/org/apache/hadoop/fs/TestTrash.java    |  14 +-
 .../org/apache/hadoop/fs/shell/TestMove.java    |   1 +
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  44 +++
 .../hadoop-hdfs/src/CMakeLists.txt              | 129 ++-----
 .../src/contrib/libwebhdfs/CMakeLists.txt       |   8 +-
 .../libwebhdfs/resources/FindJansson.cmake      |   9 +-
 .../hadoop-hdfs/src/main/bin/hdfs               |   1 +
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |   2 +-
 .../server/blockmanagement/BlockManager.java    |  18 +-
 .../BlockPlacementPolicyDefault.java            |   3 +-
 .../blockmanagement/BlockStatsMXBean.java       |  36 ++
 .../CacheReplicationMonitor.java                |   4 +-
 .../blockmanagement/DatanodeDescriptor.java     |  33 +-
 .../server/blockmanagement/DatanodeManager.java |  26 +-
 .../blockmanagement/DatanodeStatistics.java     |   6 +
 .../blockmanagement/DatanodeStorageInfo.java    |  13 +-
 .../blockmanagement/HeartbeatManager.java       |  96 ++++-
 .../blockmanagement/StorageTypeStats.java       | 115 ++++++
 .../hdfs/server/datanode/BlockScanner.java      |  38 +-
 .../hdfs/server/datanode/VolumeScanner.java     |   8 +-
 .../hdfs/server/namenode/FSDirTruncateOp.java   | 361 +++++++++++++++++++
 .../hdfs/server/namenode/FSDirectory.java       |  95 -----
 .../hdfs/server/namenode/FSEditLogLoader.java   |   6 +-
 .../hdfs/server/namenode/FSNamesystem.java      | 237 ++----------
 .../org/apache/hadoop/hdfs/tools/DFSck.java     |   1 -
 .../hdfs/tools/DelegationTokenFetcher.java      |  19 +-
 .../src/main/native/fuse-dfs/CMakeLists.txt     |  91 ++---
 .../src/main/resources/hdfs-default.xml         |   9 +-
 .../src/site/markdown/HDFSCommands.md           |  12 +-
 .../org/apache/hadoop/fs/TestGlobPaths.java     |  25 ++
 .../org/apache/hadoop/hdfs/TestDFSShell.java    |  26 ++
 .../blockmanagement/TestBlockStatsMXBean.java   | 146 ++++++++
 .../fsdataset/impl/TestFsDatasetImpl.java       |   1 +
 .../hdfs/server/namenode/TestDeadDatanode.java  |  42 +++
 .../hdfs/server/namenode/TestFileTruncate.java  |   8 +-
 .../hdfs/tools/TestDelegationTokenFetcher.java  |  15 +
 hadoop-mapreduce-project/CHANGES.txt            |  30 ++
 .../hadoop/mapred/LocalContainerLauncher.java   |   2 +-
 .../jobhistory/JobHistoryEventHandler.java      |  19 +-
 .../hadoop/mapreduce/v2/app/MRAppMaster.java    |  14 +-
 .../event/JobTaskAttemptFetchFailureEvent.java  |   9 +-
 .../TaskAttemptTooManyFetchFailureEvent.java    |  50 +++
 .../mapreduce/v2/app/job/impl/JobImpl.java      |   7 +-
 .../v2/app/job/impl/TaskAttemptImpl.java        |  15 +-
 .../hadoop/mapreduce/jobhistory/TestEvents.java |   3 +-
 .../apache/hadoop/mapreduce/v2/app/MRApp.java   |  15 +
 .../mapreduce/v2/app/TestFetchFailure.java      |  31 +-
 .../v2/app/job/impl/TestTaskAttempt.java        | 143 ++++----
 .../mapreduce/v2/jobhistory/JHAdminConfig.java  |   7 +
 .../hadoop/mapreduce/JobResourceUploader.java   |  38 +-
 .../mapreduce/jobhistory/EventReader.java       |  12 +-
 .../mapreduce/jobhistory/EventWriter.java       |  29 +-
 .../src/main/resources/mapred-default.xml       |   9 +
 .../src/CMakeLists.txt                          | 337 +++++++----------
 .../src/JNIFlags.cmake                          | 118 ------
 .../hadoop/fs/azure/NativeAzureFileSystem.java  |   5 +-
 .../java/org/apache/hadoop/tools/DistCp.java    |   3 +-
 .../apache/hadoop/tools/util/DistCpUtils.java   |  39 --
 hadoop-tools/hadoop-pipes/src/CMakeLists.txt    |  49 ++-
 hadoop-yarn-project/CHANGES.txt                 |  39 ++
 .../hadoop/yarn/client/cli/RMAdminCLI.java      |  10 +-
 .../hadoop/yarn/client/cli/TestRMAdminCLI.java  |   4 +
 .../impl/pb/SerializedExceptionPBImpl.java      |   2 +-
 .../apache/hadoop/yarn/client/ServerProxy.java  |  21 +-
 .../java/org/apache/hadoop/yarn/util/Apps.java  |  19 +-
 .../src/main/resources/yarn-default.xml         |   2 +-
 .../impl/pb/TestSerializedExceptionPBImpl.java  |  12 +-
 .../org/apache/hadoop/yarn/util/TestApps.java   |  61 ++++
 .../src/CMakeLists.txt                          |  23 +-
 .../containermanager/TestNMProxy.java           |  81 +++--
 .../scheduler/AbstractYarnScheduler.java        |  34 +-
 .../scheduler/capacity/LeafQueue.java           |   3 +-
 .../server/resourcemanager/TestRMRestart.java   |   8 +-
 .../scheduler/TestAbstractYarnScheduler.java    |  74 +++-
 90 files changed, 2469 insertions(+), 1227 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6551e11c/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index 983064e,0b60a97..2004a9c
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@@ -39,9 -39,8 +39,11 @@@ import java.util.TreeSet
  import java.util.concurrent.ThreadLocalRandom;
  import java.util.concurrent.atomic.AtomicLong;
  
 +import com.google.common.annotations.VisibleForTesting;
 +import com.google.common.base.Preconditions;
 +import com.google.common.collect.Sets;
+ import javax.management.ObjectName;
+ 
  import org.apache.hadoop.HadoopIllegalArgumentException;
  import org.apache.hadoop.classification.InterfaceAudience;
  import org.apache.hadoop.conf.Configuration;
@@@ -75,12 -83,21 +77,17 @@@ import org.apache.hadoop.hdfs.server.pr
  import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
  import org.apache.hadoop.hdfs.server.protocol.DatanodeStorage;
  import org.apache.hadoop.hdfs.server.protocol.DatanodeStorage.State;
 -import org.apache.hadoop.hdfs.server.protocol.KeyUpdateCommand;
 -import org.apache.hadoop.hdfs.server.protocol.ReceivedDeletedBlockInfo;
 -import org.apache.hadoop.hdfs.server.protocol.StorageReceivedDeletedBlocks;
  import org.apache.hadoop.hdfs.util.LightWeightLinkedSet;
+ import org.apache.hadoop.metrics2.util.MBeans;
  import org.apache.hadoop.net.Node;
  import org.apache.hadoop.security.UserGroupInformation;
  import org.apache.hadoop.util.Daemon;
  import org.apache.hadoop.util.LightWeightGSet;
  import org.apache.hadoop.util.Time;
+ 
+ import com.google.common.annotations.VisibleForTesting;
+ import com.google.common.base.Preconditions;
+ import com.google.common.collect.Sets;
 -
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6551e11c/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6551e11c/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeStorageInfo.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6551e11c/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6551e11c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
----------------------------------------------------------------------


Mime
View raw message