HDFS-5289. Race condition in TestRetryCacheWithHA#testCreateSymlink causes spurious test failure. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528693 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
86cc60c43b
commit
65a55f2294
|
@ -388,6 +388,9 @@ Release 2.1.2 - UNRELEASED
|
|||
HDFS-5279. Guard against NullPointerException in NameNode JSP pages before
|
||||
initialization of FSNamesystem. (cnauroth)
|
||||
|
||||
HDFS-5289. Race condition in TestRetryCacheWithHA#testCreateSymlink causes
|
||||
spurious test failure. (atm)
|
||||
|
||||
Release 2.1.1-beta - 2013-09-23
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -20,6 +20,7 @@ package org.apache.hadoop.hdfs.server.namenode.ha;
|
|||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.InvocationHandler;
|
||||
import java.lang.reflect.Method;
|
||||
|
@ -646,10 +647,14 @@ public class TestRetryCacheWithHA {
|
|||
@Override
|
||||
boolean checkNamenodeBeforeReturn() throws Exception {
|
||||
Path linkPath = new Path(link);
|
||||
FileStatus linkStatus = dfs.getFileLinkStatus(linkPath);
|
||||
FileStatus linkStatus = null;
|
||||
for (int i = 0; i < CHECKTIMES && linkStatus == null; i++) {
|
||||
Thread.sleep(1000);
|
||||
linkStatus = dfs.getFileLinkStatus(linkPath);
|
||||
try {
|
||||
linkStatus = dfs.getFileLinkStatus(linkPath);
|
||||
} catch (FileNotFoundException fnf) {
|
||||
// Ignoring, this can be legitimate.
|
||||
Thread.sleep(1000);
|
||||
}
|
||||
}
|
||||
return linkStatus != null;
|
||||
}
|
||||
|
@ -857,4 +862,4 @@ public class TestRetryCacheWithHA {
|
|||
+ results.get(op.name));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue