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

HDFS-7333. Improve logging in Storage.tryLock(). Contributed by Konstantin Shvachko.

This commit is contained in:
Konstantin V Shvachko 2014-11-05 09:53:23 -08:00
parent 6e8722e49c
commit 203c63030f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -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

7
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java
View File

@ -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;