Author: daryn Date: Fri Nov 30 15:13:53 2012 New Revision: 1415682 URL: http://svn.apache.org/viewvc?rev=1415682&view=rev Log: HDFS-4242. Map.Entry is incorrectly used in LeaseManager since the behavior of it is undefined after the iteration or modifications of the map. (szetszwo via daryn)
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1415682&r1=1415681&r2=1415682&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri Nov 30 15:13:53 2012 @@ -14,6 +14,10 @@ Release 0.23.6 - UNRELEASED HDFS-4233. NN keeps serving even after no journals started while rolling edit. (Kihwal Lee via suresh) + HDFS-4242. Map.Entry is incorrectly used in LeaseManager since the behavior + of it is undefined after the iteration or modifications of the map. + (szetszwo via daryn) + Release 0.23.5 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/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-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java?rev=1415682&r1=1415681&r2=1415682&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java Fri Nov 30 15:13:53 2012 @@ -20,6 +20,7 @@ package org.apache.hadoop.hdfs.server.na import java.io.IOException; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.SortedMap; @@ -310,7 +311,8 @@ public class LeaseManager { } final int len = overwrite.length(); - for(Map.Entry<String, Lease> entry : findLeaseWithPrefixPath(src, sortedLeasesByPath)) { + for(Map.Entry<String, Lease> entry + : findLeaseWithPrefixPath(src, sortedLeasesByPath).entrySet()) { final String oldpath = entry.getKey(); final Lease lease = entry.getValue(); //overwrite must be a prefix of oldpath @@ -325,7 +327,8 @@ public class LeaseManager { } synchronized void removeLeaseWithPrefixPath(String prefix) { - for(Map.Entry<String, Lease> entry : findLeaseWithPrefixPath(prefix, sortedLeasesByPath)) { + for(Map.Entry<String, Lease> entry + : findLeaseWithPrefixPath(prefix, sortedLeasesByPath).entrySet()) { if (LOG.isDebugEnabled()) { LOG.debug(LeaseManager.class.getSimpleName() + ".removeLeaseWithPrefixPath: entry=" + entry); @@ -334,13 +337,13 @@ public class LeaseManager { } } - static private List<Map.Entry<String, Lease>> findLeaseWithPrefixPath( + static private Map<String, Lease> findLeaseWithPrefixPath( String prefix, SortedMap<String, Lease> path2lease) { if (LOG.isDebugEnabled()) { LOG.debug(LeaseManager.class.getSimpleName() + ".findLease: prefix=" + prefix); } - List<Map.Entry<String, Lease>> entries = new ArrayList<Map.Entry<String, Lease>>(); + final Map<String, Lease> entries = new HashMap<String, Lease>(); final int srclen = prefix.length(); for(Map.Entry<String, Lease> entry : path2lease.tailMap(prefix).entrySet()) { @@ -349,7 +352,7 @@ public class LeaseManager { return entries; } if (p.length() == srclen || p.charAt(srclen) == Path.SEPARATOR_CHAR) { - entries.add(entry); + entries.put(entry.getKey(), entry.getValue()); } } return entries;