hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject [36/50] git commit: Merge trunk into HDFS-6584
Date Thu, 18 Sep 2014 23:15:13 GMT
Merge trunk into HDFS-6584


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8de20a19
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8de20a19
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8de20a19

Branch: refs/heads/trunk
Commit: 8de20a1987a3ca26eb006cd261d70155b3307db9
Parents: 0d85f7e 581176c
Author: Jing Zhao <jing9@apache.org>
Authored: Thu Sep 11 13:04:35 2014 -0700
Committer: Jing Zhao <jing9@apache.org>
Committed: Thu Sep 11 13:04:35 2014 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |  13 +-
 .../java/org/apache/hadoop/util/Progress.java   |  10 +-
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  12 ++
 .../hadoop/hdfs/qjournal/server/Journal.java    |   8 +-
 .../hadoop/hdfs/server/balancer/Dispatcher.java |   2 +
 .../hdfs/server/namenode/FSNamesystem.java      |   2 +-
 .../hadoop/hdfs/util/BestEffortLongFile.java    |   1 +
 .../org/apache/hadoop/hdfs/DFSTestUtil.java     |  20 +-
 .../apache/hadoop/hdfs/TestEncryptionZones.java | 187 +++++++++++++++++++
 .../hadoop/hdfs/TestEncryptionZonesWithHA.java  | 121 ++++++++++++
 .../java/org/apache/hadoop/hdfs/TestRead.java   |  22 +++
 hadoop-mapreduce-project/CHANGES.txt            |   3 +
 .../src/main/resources/mapred-default.xml       |   7 +-
 hadoop-yarn-project/CHANGES.txt                 |   3 +
 .../fair/policies/ComputeFairShares.java        |   7 +-
 .../scheduler/fair/TestFairScheduler.java       |  48 +++++
 16 files changed, 447 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/8de20a19/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/8de20a19/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
index f2a1299,14d5989..e4b7d4e
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
@@@ -725,7 -654,15 +725,9 @@@ public class Dispatcher 
            && (!srcBlocks.isEmpty() || blocksToReceive > 0)) {
          final PendingMove p = chooseNextMove();
          if (p != null) {
+           // Reset no pending move counter
+           noPendingMoveIteration=0;
 -          // move the block
 -          moveExecutor.execute(new Runnable() {
 -            @Override
 -            public void run() {
 -              p.dispatch();
 -            }
 -          });
 +          executePendingMove(p);
            continue;
          }
  

http://git-wip-us.apache.org/repos/asf/hadoop/blob/8de20a19/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/8de20a19/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
----------------------------------------------------------------------


Mime
View raw message