瀏覽代碼

HADOOP-1749. Change TestDFSUpgrade to sort files, fixing sporadic test failures. Contributed by Enis.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@570875 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 18 年之前
父節點
當前提交
099e68ff91
共有 2 個文件被更改,包括 6 次插入0 次删除
  1. 4 0
      CHANGES.txt
  2. 2 0
      src/test/org/apache/hadoop/dfs/UpgradeUtilities.java

+ 4 - 0
CHANGES.txt

@@ -61,6 +61,10 @@ Trunk (unreleased changes)
     HADOOP-1772.  Fix hadoop-daemon.sh script to get correct hostname
     under Cygwin.  (Tsz Wo (Nicholas), SZE via cutting)
 
+    HADOOP-1749.  Change TestDFSUpgrade to sort files, fixing sporadic
+    test failures.  (Enis Soztutar via cutting)
+
+
   IMPROVEMENTS
 
     HADOOP-1756. Add toString() to some Writable-s. (ab)

+ 2 - 0
src/test/org/apache/hadoop/dfs/UpgradeUtilities.java

@@ -25,6 +25,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
+import java.util.Arrays;
 import java.util.Random;
 import java.util.zip.CRC32;
 import org.apache.hadoop.conf.Configuration;
@@ -200,6 +201,7 @@ public class UpgradeUtilities {
                                          "Given argument is not a directory:" + dir);
     }
     File[] list = dir.listFiles();
+    Arrays.sort(list);
     CRC32 checksum = new CRC32();
     for (int i = 0; i < list.length; i++) {
       if (list[i].isFile()) {