hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject git commit: HDFS-7361. TestCheckpoint fails after change of log message related to locking violation. Contributed by Konstantin Shvachko.
Date Thu, 06 Nov 2014 04:30:08 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk e4b4901d3 -> 240cb59b9


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/240cb59b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/240cb59b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/240cb59b

Branch: refs/heads/trunk
Commit: 240cb59b9fb6841c64a47c6797c605a454f7b47f
Parents: e4b4901
Author: Konstantin V Shvachko <shv@apache.org>
Authored: Wed Nov 5 20:14:28 2014 -0800
Committer: Konstantin V Shvachko <shv@apache.org>
Committed: Wed Nov 5 20:15:16 2014 -0800

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt               |  7 +++++--
 .../hadoop/hdfs/server/namenode/TestCheckpoint.java       | 10 ++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/240cb59b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 6ec8199..c6e848f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/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
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/240cb59b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
index d51c1cc..bb4689d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
+++ b/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));


Mime
View raw message