Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-9691. TestBlockManagerSafeMode#testCheckSafeMode fails intermittently. Contributed by Mingliang Liu. 

(cherry picked from commit ac5da11399)
This commit is contained in:
Akira Ajisaka 2016-02-15 14:00:09 +09:00
parent a670165bbd
commit 75c5470165
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -80,6 +80,9 @@ Release 2.9.0 - UNRELEASED
HDFS-9621. Consolidate FSDirStatAndListingOp#createFileStatus to let its HDFS-9621. Consolidate FSDirStatAndListingOp#createFileStatus to let its
INodesInPath parameter always include the target INode. (jing9) INodesInPath parameter always include the target INode. (jing9)
HDFS-9691. TestBlockManagerSafeMode#testCheckSafeMode fails intermittently.
(Mingliang Liu via aajisaka)
Release 2.8.0 - UNRELEASED Release 2.8.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

8
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManagerSafeMode.java
View File

@ -136,30 +136,30 @@ public class TestBlockManagerSafeMode {
} }
// PENDING_THRESHOLD -> EXTENSION // PENDING_THRESHOLD -> EXTENSION
Whitebox.setInternalState(bmSafeMode, "extension", Integer.MAX_VALUE);
setSafeModeStatus(BMSafeModeStatus.PENDING_THRESHOLD); setSafeModeStatus(BMSafeModeStatus.PENDING_THRESHOLD);
setBlockSafe(BLOCK_THRESHOLD); setBlockSafe(BLOCK_THRESHOLD);
bmSafeMode.checkSafeMode(); bmSafeMode.checkSafeMode();
assertEquals(BMSafeModeStatus.EXTENSION, getSafeModeStatus()); assertEquals(BMSafeModeStatus.EXTENSION, getSafeModeStatus());
Whitebox.setInternalState(bmSafeMode, "smmthread", null);
// PENDING_THRESHOLD -> OFF // PENDING_THRESHOLD -> OFF
Whitebox.setInternalState(bmSafeMode, "extension", 0);
setSafeModeStatus(BMSafeModeStatus.PENDING_THRESHOLD); setSafeModeStatus(BMSafeModeStatus.PENDING_THRESHOLD);
setBlockSafe(BLOCK_THRESHOLD); setBlockSafe(BLOCK_THRESHOLD);
Whitebox.setInternalState(bmSafeMode, "extension", 0);
bmSafeMode.checkSafeMode(); bmSafeMode.checkSafeMode();
assertEquals(BMSafeModeStatus.OFF, getSafeModeStatus()); assertEquals(BMSafeModeStatus.OFF, getSafeModeStatus());
// stays in EXTENSION // stays in EXTENSION
setSafeModeStatus(BMSafeModeStatus.EXTENSION);
setBlockSafe(0); setBlockSafe(0);
setSafeModeStatus(BMSafeModeStatus.EXTENSION);
Whitebox.setInternalState(bmSafeMode, "extension", 0); Whitebox.setInternalState(bmSafeMode, "extension", 0);
bmSafeMode.checkSafeMode(); bmSafeMode.checkSafeMode();
assertEquals(BMSafeModeStatus.EXTENSION, getSafeModeStatus()); assertEquals(BMSafeModeStatus.EXTENSION, getSafeModeStatus());
// stays in EXTENSION: pending extension period // stays in EXTENSION: pending extension period
Whitebox.setInternalState(bmSafeMode, "extension", Integer.MAX_VALUE);
setSafeModeStatus(BMSafeModeStatus.EXTENSION); setSafeModeStatus(BMSafeModeStatus.EXTENSION);
setBlockSafe(BLOCK_THRESHOLD); setBlockSafe(BLOCK_THRESHOLD);
Whitebox.setInternalState(bmSafeMode, "extension", Integer.MAX_VALUE);
bmSafeMode.checkSafeMode(); bmSafeMode.checkSafeMode();
assertEquals(BMSafeModeStatus.EXTENSION, getSafeModeStatus()); assertEquals(BMSafeModeStatus.EXTENSION, getSafeModeStatus());
} }