From 203c63030f625866e220656a8efdf05109dc7627 Mon Sep 17 00:00:00 2001 From: Konstantin V Shvachko Date: Wed, 5 Nov 2014 09:53:23 -0800 Subject: [PATCH] HDFS-7333. Improve logging in Storage.tryLock(). Contributed by Konstantin Shvachko. --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../java/org/apache/hadoop/hdfs/server/common/Storage.java | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 75a7834a2ca..be672a6c2fc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -336,6 +336,8 @@ Release 2.7.0 - UNRELEASED HDFS-7335. Redundant checkOperation() in FSN.analyzeFileState(). (Milan Desai via shv) + HDFS-7333. Improve logging in Storage.tryLock(). (shv) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java index f83cf3b004f..31fdb843856 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java @@ -716,12 +716,13 @@ FileLock tryLock() throws IOException { } catch(OverlappingFileLockException oe) { // Cannot read from the locked file on Windows. String lockingJvmName = Path.WINDOWS ? "" : (" " + file.readLine()); - LOG.error("It appears that another namenode" + lockingJvmName - + " has already locked the storage directory"); + LOG.error("It appears that another node " + lockingJvmName + + " has already locked the storage directory: " + root, oe); file.close(); return null; } catch(IOException e) { - LOG.error("Failed to acquire lock on " + lockF + ". If this storage directory is mounted via NFS, " + LOG.error("Failed to acquire lock on " + lockF + + ". If this storage directory is mounted via NFS, " + "ensure that the appropriate nfs lock services are running.", e); file.close(); throw e;