You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by da...@apache.org on 2012/11/13 16:29:05 UTC
svn commit: r1408779 - in
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
Author: daryn
Date: Tue Nov 13 15:29:04 2012
New Revision: 1408779
URL: http://svn.apache.org/viewvc?rev=1408779&view=rev
Log:
HDFS-4181. LeaseManager tries to double remove and prints extra messages (Kihwal Lee via daryn)
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1408779&r1=1408778&r2=1408779&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Tue Nov 13 15:29:04 2012
@@ -1980,6 +1980,9 @@ Release 0.23.5 - UNRELEASED
HDFS-3990. NN's health report has severe performance problems (daryn)
+ HDFS-4181. LeaseManager tries to double remove and prints extra messages
+ (Kihwal Lee via daryn)
+
BUG FIXES
HDFS-3829. TestHftpURLTimeouts fails intermittently with JDK7 (Trevor
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java?rev=1408779&r1=1408778&r2=1408779&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java Tue Nov 13 15:29:04 2012
@@ -135,7 +135,9 @@ public class LeaseManager {
synchronized void removeLease(Lease lease, String src) {
sortedLeasesByPath.remove(src);
if (!lease.removePath(src)) {
- LOG.error(src + " not found in lease.paths (=" + lease.paths + ")");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(src + " not found in lease.paths (=" + lease.paths + ")");
+ }
}
if (!lease.hasPath()) {
@@ -440,11 +442,14 @@ public class LeaseManager {
oldest.getPaths().toArray(leasePaths);
for(String p : leasePaths) {
try {
- if(fsnamesystem.internalReleaseLease(oldest, p, HdfsServerConstants.NAMENODE_LEASE_HOLDER)) {
- LOG.info("Lease recovery for " + p + " is complete. File closed.");
- removing.add(p);
- } else {
- LOG.info("Started block recovery " + p + " lease " + oldest);
+ boolean completed = fsnamesystem.internalReleaseLease(oldest, p,
+ HdfsServerConstants.NAMENODE_LEASE_HOLDER);
+ if (LOG.isDebugEnabled()) {
+ if (completed) {
+ LOG.debug("Lease recovery for " + p + " is complete. File closed.");
+ } else {
+ LOG.debug("Started block recovery " + p + " lease " + oldest);
+ }
}
} catch (IOException e) {
LOG.error("Cannot release the path " + p + " in the lease "