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

Merge trunk into HA branch. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1233533 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Aaron Myers 2012-01-19 19:02:07 +00:00
parent 6177bf6c8f 1d2e706dd1
commit 3e17cdde56
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,6 +266,9 @@ Release 0.23.1 - UNRELEASED
not use ArrayWritable for writing non-array items. (Uma Maheswara Rao G not use ArrayWritable for writing non-array items. (Uma Maheswara Rao G
via szetszwo) via szetszwo)
HDFS-2803. Add logging to LeaseRenewer for better lease expiration debugging.
(Jimmy Xiang via todd)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-2130. Switch default checksum to CRC32C. (todd) HDFS-2130. Switch default checksum to CRC32C. (todd)

24
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/LeaseRenewer.java
View File

@ -292,6 +292,10 @@ synchronized void put(final String src, final DFSOutputStream out,
@Override @Override
public void run() { public void run() {
try { try {
if (LOG.isDebugEnabled()) {
LOG.debug("Lease renewer daemon for " + clientsString()
+ " with renew id " + id + " started");
}
LeaseRenewer.this.run(id); LeaseRenewer.this.run(id);
} catch(InterruptedException e) { } catch(InterruptedException e) {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
@ -302,6 +306,10 @@ public void run() {
synchronized(LeaseRenewer.this) { synchronized(LeaseRenewer.this) {
Factory.INSTANCE.remove(LeaseRenewer.this); Factory.INSTANCE.remove(LeaseRenewer.this);
} }
if (LOG.isDebugEnabled()) {
LOG.debug("Lease renewer daemon for " + clientsString()
+ " with renew id " + id + " exited");
}
} }
} }
@ -401,6 +409,9 @@ public int compare(final DFSClient left, final DFSClient right) {
if (!c.getClientName().equals(previousName)) { if (!c.getClientName().equals(previousName)) {
c.renewLease(); c.renewLease();
previousName = c.getClientName(); previousName = c.getClientName();
if (LOG.isDebugEnabled()) {
LOG.debug("Lease renewed for client " + previousName);
}
} }
} }
} }
@ -416,6 +427,10 @@ private void run(final int id) throws InterruptedException {
if (System.currentTimeMillis() - lastRenewed >= getRenewalTime()) { if (System.currentTimeMillis() - lastRenewed >= getRenewalTime()) {
try { try {
renew(); renew();
if (LOG.isDebugEnabled()) {
LOG.debug("Lease renewer daemon for " + clientsString()
+ " with renew id " + id + " executed");
}
lastRenewed = System.currentTimeMillis(); lastRenewed = System.currentTimeMillis();
} catch (SocketTimeoutException ie) { } catch (SocketTimeoutException ie) {
LOG.warn("Failed to renew lease for " + clientsString() + " for " LOG.warn("Failed to renew lease for " + clientsString() + " for "
@ -435,6 +450,15 @@ private void run(final int id) throws InterruptedException {
synchronized(this) { synchronized(this) {
if (id != currentId || isRenewerExpired()) { if (id != currentId || isRenewerExpired()) {
if (LOG.isDebugEnabled()) {
if (id != currentId) {
LOG.debug("Lease renewer daemon for " + clientsString()
+ " with renew id " + id + " is not current");
} else {
LOG.debug("Lease renewer daemon for " + clientsString()
+ " with renew id " + id + " expired");
}
}
//no longer the current daemon or expired //no longer the current daemon or expired
return; return;
} }