svn merge -c 1509565 from trunk for HDFS-5028. LeaseRenewer throws ConcurrentModificationException when timeout.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509566 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2013-08-02 07:12:28 +00:00
parent a416371e7d
commit 65ae6f9eed
2 changed files with 5 additions and 2 deletions

View File

@ -62,6 +62,9 @@ Release 2.1.1-beta - UNRELEASED
BUG FIXES
HDFS-5028. LeaseRenewer throws ConcurrentModificationException when timeout.
(zhaoyunjiong via szetszwo)
Release 2.1.0-beta - 2013-08-06
INCOMPATIBLE CHANGES

View File

@ -449,8 +449,8 @@ private void run(final int id) throws InterruptedException {
LOG.warn("Failed to renew lease for " + clientsString() + " for "
+ (elapsed/1000) + " seconds. Aborting ...", ie);
synchronized (this) {
for(DFSClient c : dfsclients) {
c.abort();
while (!dfsclients.isEmpty()) {
dfsclients.get(0).abort();
}
}
break;