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

HDFS-7361. TestCheckpoint fails after change of log message related to locking violation. Contributed by Konstantin Shvachko.

This commit is contained in:
Konstantin V Shvachko 2014-11-05 20:23:13 -08:00
parent e26be1d85c
commit 74d40b3d9e
2 changed files with 9 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

@ -86,6 +86,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7333. Improve logging in Storage.tryLock(). (shv) HDFS-7333. Improve logging in Storage.tryLock(). (shv)
HDFS-7361. TestCheckpoint fails after change of log message related to
locking violation. (shv)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

10
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
View File

@ -846,7 +846,7 @@ public class TestCheckpoint {
} }
/** /**
* Test that, an attempt to lock a storage that is already locked by a nodename, * Test that, an attempt to lock a storage that is already locked by nodename,
* logs error message that includes JVM name of the namenode that locked it. * logs error message that includes JVM name of the namenode that locked it.
*/ */
@Test @Test
@ -862,16 +862,18 @@ public class TestCheckpoint {
savedSd = sd; savedSd = sd;
} }
LogCapturer logs = GenericTestUtils.LogCapturer.captureLogs(LogFactory.getLog(Storage.class)); LogCapturer logs = GenericTestUtils.LogCapturer.captureLogs(
LogFactory.getLog(Storage.class));
try { try {
// try to lock the storage that's already locked // try to lock the storage that's already locked
savedSd.lock(); savedSd.lock();
fail("Namenode should not be able to lock a storage that is already locked"); fail("Namenode should not be able to lock a storage" +
" that is already locked");
} catch (IOException ioe) { } catch (IOException ioe) {
// cannot read lock file on Windows, so message cannot get JVM name // cannot read lock file on Windows, so message cannot get JVM name
String lockingJvmName = Path.WINDOWS ? "" : String lockingJvmName = Path.WINDOWS ? "" :
" " + ManagementFactory.getRuntimeMXBean().getName(); " " + ManagementFactory.getRuntimeMXBean().getName();
String expectedLogMessage = "It appears that another namenode" String expectedLogMessage = "It appears that another node "
+ lockingJvmName + " has already locked the storage directory"; + lockingJvmName + " has already locked the storage directory";
assertTrue("Log output does not contain expected log message: " assertTrue("Log output does not contain expected log message: "
+ expectedLogMessage, logs.getOutput().contains(expectedLogMessage)); + expectedLogMessage, logs.getOutput().contains(expectedLogMessage));