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

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -333,13 +333,16 @@ Release 2.7.0 - UNRELEASED
 
     HDFS-7356. Use DirectoryListing.hasMore() directly in nfs. (Li Lu via jing9)
 
+    HDFS-7357. FSNamesystem.checkFileProgress should log file path.
+    (Tsz Wo Nicholas Sze via wheat9)
+
     HDFS-7335. Redundant checkOperation() in FSN.analyzeFileState().
     (Milan Desai via shv)
 
     HDFS-7333. Improve logging in Storage.tryLock(). (shv)
 
-    HDFS-7357. FSNamesystem.checkFileProgress should log file path.
-    (Tsz Wo Nicholas Sze via wheat9)
+    HDFS-7361. TestCheckpoint fails after change of log message related to
+    locking violation. (shv)
 
   OPTIMIZATIONS
 

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

@@ -837,7 +837,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.
    */
   @Test
@@ -853,16 +853,18 @@ public class TestCheckpoint {
         savedSd = sd;
       }
       
-      LogCapturer logs = GenericTestUtils.LogCapturer.captureLogs(LogFactory.getLog(Storage.class));
+      LogCapturer logs = GenericTestUtils.LogCapturer.captureLogs(
+          LogFactory.getLog(Storage.class));
       try {
         // try to lock the storage that's already locked
         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) {
         // cannot read lock file on Windows, so message cannot get JVM name
         String lockingJvmName = Path.WINDOWS ? "" :
           " " + ManagementFactory.getRuntimeMXBean().getName();
-        String expectedLogMessage = "It appears that another namenode"
+        String expectedLogMessage = "It appears that another node "
           + lockingJvmName + " has already locked the storage directory";
         assertTrue("Log output does not contain expected log message: "
           + expectedLogMessage, logs.getOutput().contains(expectedLogMessage));