big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-2714. Fix test cases which use standalone FSNamesystems. Contributed by Todd Lipcon.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225708 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2011-12-30 00:25:21 +00:00
parent f216303598
commit 15ebdd5664
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
View File

@ -75,3 +75,5 @@ HDFS-2682. When a FailoverProxyProvider is used, Client should not retry for 45
HDFS-2693. Fix synchronization issues around state transition (todd) HDFS-2693. Fix synchronization issues around state transition (todd)
HDFS-1972. Fencing mechanism for block invalidations and replications (todd) HDFS-1972. Fencing mechanism for block invalidations and replications (todd)
HDFS-2714. Fix test cases which use standalone FSNamesystems (todd)

3
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
View File

@ -579,8 +579,11 @@ void stopStandbyServices() throws IOException {
void checkOperation(OperationCategory op) throws StandbyException { void checkOperation(OperationCategory op) throws StandbyException {
if (haContext != null) {
// null in some unit tests
haContext.checkOperation(op); haContext.checkOperation(op);
} }
}
public static Collection<URI> getNamespaceDirs(Configuration conf) { public static Collection<URI> getNamespaceDirs(Configuration conf) {
return getStorageDirs(conf, DFS_NAMENODE_NAME_DIR_KEY); return getStorageDirs(conf, DFS_NAMENODE_NAME_DIR_KEY);

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java
View File

@ -375,6 +375,7 @@ public void run() {
true); true);
LOG.info("mkdirs complete"); LOG.info("mkdirs complete");
} catch (Throwable ioe) { } catch (Throwable ioe) {
LOG.fatal("Got exception", ioe);
deferredException.set(ioe); deferredException.set(ioe);
waitToEnterFlush.countDown(); waitToEnterFlush.countDown();
} }
@ -469,6 +470,7 @@ public void run() {
true); true);
LOG.info("mkdirs complete"); LOG.info("mkdirs complete");
} catch (Throwable ioe) { } catch (Throwable ioe) {
LOG.fatal("Got exception", ioe);
deferredException.set(ioe); deferredException.set(ioe);
waitToEnterSync.countDown(); waitToEnterSync.countDown();
} }