You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2014/11/05 19:00:46 UTC
git commit: HDFS-7333. Improve logging in Storage.tryLock().
Contributed by Konstantin Shvachko.
Repository: hadoop
Updated Branches:
refs/heads/trunk 6e8722e49 -> 203c63030
HDFS-7333. Improve logging in Storage.tryLock(). 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/203c6303
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/203c6303
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/203c6303
Branch: refs/heads/trunk
Commit: 203c63030f625866e220656a8efdf05109dc7627
Parents: 6e8722e
Author: Konstantin V Shvachko <sh...@apache.org>
Authored: Wed Nov 5 09:53:23 2014 -0800
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Wed Nov 5 09:53:23 2014 -0800
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/203c6303/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 75a7834..be672a6 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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/203c6303/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java
----------------------------------------------------------------------
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 f83cf3b..31fdb84 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 @@ public abstract class Storage extends StorageInfo {
} 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;