Author: daryn
Date: Mon Jul 9 16:09:06 2012
New Revision: 1359247
URL: http://svn.apache.org/viewvc?rev=1359247&view=rev
Log:
svn merge -c 1296016 FIXES: HDFS-3037.
TestMulitipleNNDataBlockScanner#testBlockScannerAfterRestart is racy.
Contributed by Aaron T. Myers.
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestMulitipleNNDataBlockScanner.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1359247&r1=1359246&r2=1359247&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Mon Jul 9 16:09:06 2012
@@ -55,6 +55,9 @@ Release 0.23.3 - UNRELEASED
HDFS-3603. Decouple TestHDFSTrash from TestTrash. (Jason Lowe via eli)
+ HDFS-3037. TestMulitipleNNDataBlockScanner#testBlockScannerAfterRestart is
+ racy. (atm)
+
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestMulitipleNNDataBlockScanner.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestMulitipleNNDataBlockScanner.java?rev=1359247&r1=1359246&r2=1359247&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestMulitipleNNDataBlockScanner.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestMulitipleNNDataBlockScanner.java
Mon Jul 9 16:09:06 2012
@@ -146,6 +146,9 @@ public class TestMulitipleNNDataBlockSca
cluster.waitActive();
DataNode dn = cluster.getDataNodes().get(0);
for (int i = 0; i < 3; i++) {
+ while (!dn.blockScanner.isInitialized(bpids[i])) {
+ Thread.sleep(1000);
+ }
long blocksScanned = 0;
while (blocksScanned != 20) {
if (dn.blockScanner != null) {
