Author: daryn
Date: Tue Nov 13 15:31:17 2012
New Revision: 1408780
URL: http://svn.apache.org/viewvc?rev=1408780&view=rev
Log:
svn merge -c 1408779 FIXES: HDFS-4181. LeaseManager tries to double remove and
prints extra messages (Kihwal Lee via daryn)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1408780&r1=1408779&r2=1408780&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Tue Nov 13 15:31:17 2012
@@ -1697,6 +1697,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/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java?rev=1408780&r1=1408779&r2=1408780&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
Tue Nov 13 15:31:17 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 "
