HDFS-7051. TestDataNodeRollingUpgrade#isBlockFileInPrevious assumes Unix file path separator. Contributed by Chris Nauroth.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d6ce2698 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d6ce2698 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d6ce2698 Branch: refs/heads/HDFS-6584 Commit: d6ce26986e79d770bc7588649373f2ae3bf15f94 Parents: 6b8b160 Author: cnauroth <cnaur...@apache.org> Authored: Thu Sep 11 20:58:15 2014 -0700 Committer: cnauroth <cnaur...@apache.org> Committed: Thu Sep 11 20:58:15 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hdfs/server/datanode/TestDataNodeRollingUpgrade.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d6ce2698/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 212a9a2..bddf303 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -754,6 +754,9 @@ Release 2.6.0 - UNRELEASED HDFS-7042. Upgrade fails for Windows HA cluster due to file locks held during rename in JournalNode. (cnauroth) + HDFS-7051. TestDataNodeRollingUpgrade#isBlockFileInPrevious assumes Unix file + path separator. (cnauroth) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/d6ce2698/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeRollingUpgrade.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeRollingUpgrade.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeRollingUpgrade.java index befb298..7fd8398 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeRollingUpgrade.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeRollingUpgrade.java @@ -157,7 +157,9 @@ public class TestDataNodeRollingUpgrade { } private boolean isBlockFileInPrevious(File blockFile) { - Pattern blockFilePattern = Pattern.compile("^(.*/current/.*/)(current)(/.*)$"); + Pattern blockFilePattern = Pattern.compile(String.format( + "^(.*%1$scurrent%1$s.*%1$s)(current)(%1$s.*)$", + Pattern.quote(File.separator))); Matcher matcher = blockFilePattern.matcher(blockFile.toString()); String previousFileName = matcher.replaceFirst("$1" + "previous" + "$3"); return ((new File(previousFileName)).exists()); @@ -355,7 +357,7 @@ public class TestDataNodeRollingUpgrade { assertTrue(isBlockFileInPrevious(blockFiles[1])); assertFalse(isTrashRootPresent()); - // Rollback and ensure that neither block file exists in trash or previous. + // Finalize and ensure that neither block file exists in trash or previous. finalizeRollingUpgrade(); assertFalse(isTrashRootPresent()); assertFalse(isBlockFileInPrevious(blockFiles[0]));
