[03/23] hadoop git commit: HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. Contributed by Xiao Chen.

2016-01-11 Thread arp 
HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. 
Contributed by Xiao Chen.

Change-Id: Ia766a5bfb89f8cf8a48b473bb27c30d5818ebfc0


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

Branch: refs/heads/HDFS-1312
Commit: 0af2022e6d431e746301086980134730d4287cc7
Parents: 38c4c14
Author: Zhe Zhang 
Authored: Fri Jan 8 13:14:36 2016 -0800
Committer: Zhe Zhang 
Committed: Fri Jan 8 13:14:36 2016 -0800

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt   | 3 +++
 .../hadoop/hdfs/server/datanode/TestBlockReplacement.java | 7 ---
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0af2022e/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 887ddef..64cab74 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -406,6 +406,9 @@ Trunk (Unreleased)
 HDFS-9615. Fix variable name typo in DFSConfigKeys. (Ray Chiang via
 Arpit Agarwal)
 
+HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally.
+(Xiao Chen via zhz)
+
 BREAKDOWN OF HDFS-7285 SUBTASKS AND RELATED JIRAS
 
   HDFS-7347. Configurable erasure coding policy for individual files and

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0af2022e/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
index d2bf734..bfd02e2 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
@@ -198,9 +198,10 @@ public class TestBlockReplacement {
   LOG.info("Testcase 4: invalid del hint " + proxies.get(0) );
   assertTrue(replaceBlock(b, proxies.get(0), proxies.get(1), source));
   // after cluster has time to resolve the over-replication,
-  // block locations should contain two proxies,
-  // and either source or newNode, but not both.
-  checkBlocks(proxies.toArray(new DatanodeInfo[proxies.size()]), 
+  // block locations should contain any 3 of the blocks, since after the
+  // deletion the number of racks is still >=2 for sure.
+  // See HDFS-9314 for details, espacially the comment on 18/Nov/15 14:09.
+  checkBlocks(new DatanodeInfo[]{},
   fileName.toString(), 
   DEFAULT_BLOCK_SIZE, REPLICATION_FACTOR, client);
 } finally {

hadoop git commit: HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. Contributed by Xiao Chen.

2016-01-08 Thread zhz 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 d1cbc8442 -> eef26388c


HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. 
Contributed by Xiao Chen.

Change-Id: I5cee398dfc361121d8b666ffd1203cc14a4ace24


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

Branch: refs/heads/branch-2.8
Commit: eef26388cab130ac120f62f2843b4aef3b999aef
Parents: d1cbc84
Author: Zhe Zhang 
Authored: Fri Jan 8 13:14:36 2016 -0800
Committer: Zhe Zhang 
Committed: Fri Jan 8 13:20:02 2016 -0800

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt   | 3 +++
 .../hadoop/hdfs/server/datanode/TestBlockReplacement.java | 7 ---
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/eef26388/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 052ca14..243db7c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1640,6 +1640,9 @@ Release 2.8.0 - UNRELEASED
 HDFS-9619. SimulatedFSDataset sometimes can not find blockpool for the
 correct namenode (Wei-Chiu Chuang via vinayakumarb)
 
+HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally.
+(Xiao Chen via zhz)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/eef26388/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
index d2bf734..bfd02e2 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
@@ -198,9 +198,10 @@ public class TestBlockReplacement {
   LOG.info("Testcase 4: invalid del hint " + proxies.get(0) );
   assertTrue(replaceBlock(b, proxies.get(0), proxies.get(1), source));
   // after cluster has time to resolve the over-replication,
-  // block locations should contain two proxies,
-  // and either source or newNode, but not both.
-  checkBlocks(proxies.toArray(new DatanodeInfo[proxies.size()]), 
+  // block locations should contain any 3 of the blocks, since after the
+  // deletion the number of racks is still >=2 for sure.
+  // See HDFS-9314 for details, espacially the comment on 18/Nov/15 14:09.
+  checkBlocks(new DatanodeInfo[]{},
   fileName.toString(), 
   DEFAULT_BLOCK_SIZE, REPLICATION_FACTOR, client);
 } finally {

hadoop git commit: HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. Contributed by Xiao Chen.

2016-01-08 Thread zhz 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 38c4c1447 -> 0af2022e6


HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. 
Contributed by Xiao Chen.

Change-Id: Ia766a5bfb89f8cf8a48b473bb27c30d5818ebfc0


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

Branch: refs/heads/trunk
Commit: 0af2022e6d431e746301086980134730d4287cc7
Parents: 38c4c14
Author: Zhe Zhang 
Authored: Fri Jan 8 13:14:36 2016 -0800
Committer: Zhe Zhang 
Committed: Fri Jan 8 13:14:36 2016 -0800

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt   | 3 +++
 .../hadoop/hdfs/server/datanode/TestBlockReplacement.java | 7 ---
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0af2022e/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 887ddef..64cab74 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -406,6 +406,9 @@ Trunk (Unreleased)
 HDFS-9615. Fix variable name typo in DFSConfigKeys. (Ray Chiang via
 Arpit Agarwal)
 
+HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally.
+(Xiao Chen via zhz)
+
 BREAKDOWN OF HDFS-7285 SUBTASKS AND RELATED JIRAS
 
   HDFS-7347. Configurable erasure coding policy for individual files and

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0af2022e/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
index d2bf734..bfd02e2 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
@@ -198,9 +198,10 @@ public class TestBlockReplacement {
   LOG.info("Testcase 4: invalid del hint " + proxies.get(0) );
   assertTrue(replaceBlock(b, proxies.get(0), proxies.get(1), source));
   // after cluster has time to resolve the over-replication,
-  // block locations should contain two proxies,
-  // and either source or newNode, but not both.
-  checkBlocks(proxies.toArray(new DatanodeInfo[proxies.size()]), 
+  // block locations should contain any 3 of the blocks, since after the
+  // deletion the number of racks is still >=2 for sure.
+  // See HDFS-9314 for details, espacially the comment on 18/Nov/15 14:09.
+  checkBlocks(new DatanodeInfo[]{},
   fileName.toString(), 
   DEFAULT_BLOCK_SIZE, REPLICATION_FACTOR, client);
 } finally {

hadoop git commit: HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. Contributed by Xiao Chen.

2016-01-08 Thread zhz 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 8d04b7c27 -> 40dabae23


HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. 
Contributed by Xiao Chen.

Change-Id: I5cee398dfc361121d8b666ffd1203cc14a4ace24


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

Branch: refs/heads/branch-2
Commit: 40dabae236c82881e28614fbe1fcd1cf707b7033
Parents: 8d04b7c
Author: Zhe Zhang 
Authored: Fri Jan 8 13:14:36 2016 -0800
Committer: Zhe Zhang 
Committed: Fri Jan 8 13:19:14 2016 -0800

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt   | 3 +++
 .../hadoop/hdfs/server/datanode/TestBlockReplacement.java | 7 ---
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/40dabae2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index e1434c8..ebcc6aa 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1687,6 +1687,9 @@ Release 2.8.0 - UNRELEASED
 HDFS-9619. SimulatedFSDataset sometimes can not find blockpool for the
 correct namenode (Wei-Chiu Chuang via vinayakumarb)
 
+HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally.
+(Xiao Chen via zhz)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/40dabae2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
index d2bf734..bfd02e2 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
@@ -198,9 +198,10 @@ public class TestBlockReplacement {
   LOG.info("Testcase 4: invalid del hint " + proxies.get(0) );
   assertTrue(replaceBlock(b, proxies.get(0), proxies.get(1), source));
   // after cluster has time to resolve the over-replication,
-  // block locations should contain two proxies,
-  // and either source or newNode, but not both.
-  checkBlocks(proxies.toArray(new DatanodeInfo[proxies.size()]), 
+  // block locations should contain any 3 of the blocks, since after the
+  // deletion the number of racks is still >=2 for sure.
+  // See HDFS-9314 for details, espacially the comment on 18/Nov/15 14:09.
+  checkBlocks(new DatanodeInfo[]{},
   fileName.toString(), 
   DEFAULT_BLOCK_SIZE, REPLICATION_FACTOR, client);
 } finally {