HDFS-5244. TestNNStorageRetentionManager#testPurgeMultipleDirs fails. Contributed bye Jinghui Wang.

Suresh Srinivas · Suresh Srinivas · commit 3ea2ad5b0ece · 2014-03-13T17:21:09.000Z
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577254 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -605,6 +605,9 @@ Release 2.4.0 - UNRELEASED
 
     HDFS-6096. TestWebHdfsTokens may timeout. (szetszwo via Arpit Agarwal)
 
+    HDFS-5244. TestNNStorageRetentionManager#testPurgeMultipleDirs fails.
+    (Jinghui Wang via suresh)
+
   BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
 
     HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNNStorageRetentionManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNNStorageRetentionManager.java
@@ -268,7 +268,7 @@ private void runTest(TestCaseDescription tc) throws IOException {
   }
   
   private class TestCaseDescription {
-    private Map<File, FakeRoot> dirRoots = Maps.newHashMap();
+    private Map<File, FakeRoot> dirRoots = Maps.newLinkedHashMap();
     private Set<File> expectedPurgedLogs = Sets.newLinkedHashSet();
     private Set<File> expectedPurgedImages = Sets.newLinkedHashSet();
     

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ private void runTest(TestCaseDescription tc) throws IOException {`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`private class TestCaseDescription {`
`271`		`- private Map<File, FakeRoot> dirRoots = Maps.newHashMap();`
	`271`	`+ private Map<File, FakeRoot> dirRoots = Maps.newLinkedHashMap();`
`272`	`272`	`private Set<File> expectedPurgedLogs = Sets.newLinkedHashSet();`
`273`	`273`	`private Set<File> expectedPurgedImages = Sets.newLinkedHashSet();`
`274`	`274`