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 sz...@apache.org on 2016/04/07 06:39:08 UTC
hadoop git commit: HDFS-10186. DirectoryScanner: Improve logs by
adding full path of both actual and expected block directories. Contributed
by Rakesh R
Repository: hadoop
Updated Branches:
refs/heads/trunk 4bd7cbc29 -> 654cd1d0c
HDFS-10186. DirectoryScanner: Improve logs by adding full path of both actual and expected block directories. Contributed by Rakesh R
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/654cd1d0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/654cd1d0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/654cd1d0
Branch: refs/heads/trunk
Commit: 654cd1d0c0427c23e73804fc9d87208f76bbf6aa
Parents: 4bd7cbc
Author: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Authored: Thu Apr 7 12:36:29 2016 +0800
Committer: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Committed: Thu Apr 7 12:38:42 2016 +0800
----------------------------------------------------------------------
.../hadoop/hdfs/server/datanode/DirectoryScanner.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/654cd1d0/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
index 083ca31..0e51cec 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
@@ -902,8 +902,7 @@ public class DirectoryScanner implements Runnable {
break;
}
}
- verifyFileLocation(blockFile.getParentFile(), bpFinalizedDir,
- blockId);
+ verifyFileLocation(blockFile, bpFinalizedDir, blockId);
report.add(new ScanInfo(blockId, blockFile, metaFile, vol));
}
return report;
@@ -913,12 +912,15 @@ public class DirectoryScanner implements Runnable {
* Verify whether the actual directory location of block file has the
* expected directory path computed using its block ID.
*/
- private void verifyFileLocation(File actualBlockDir,
+ private void verifyFileLocation(File actualBlockFile,
File bpFinalizedDir, long blockId) {
File blockDir = DatanodeUtil.idToBlockDir(bpFinalizedDir, blockId);
- if (actualBlockDir.compareTo(blockDir) != 0) {
+ if (actualBlockFile.getParentFile().compareTo(blockDir) != 0) {
+ File expBlockFile = new File(blockDir, actualBlockFile.getName());
LOG.warn("Block: " + blockId
- + " has to be upgraded to block ID-based layout");
+ + " has to be upgraded to block ID-based layout. "
+ + "Actual block file path: " + actualBlockFile
+ + ", expected block file path: " + expBlockFile);
}
}