From d7c8a6feaafe7ddbd00fcee081d0fbd5da2b25a7 Mon Sep 17 00:00:00 2001 From: Xiaoyu Yao Date: Tue, 16 Jun 2015 12:38:07 -0700 Subject: [PATCH] HDFS-8597. Fix TestFSImage#testZeroBlockSize on Windows. Contributed by Xiaoyu Yao. (cherry picked from commit 4e88ff5b27cc33d311ab7a7248c3cf6303997ddd) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../apache/hadoop/hdfs/server/datanode/StorageLocation.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index db8a0318451..16f880dbfea 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -687,6 +687,8 @@ Release 2.7.1 - UNRELEASED HDFS-8544. Incorrect port specified in HFTP Guide document in branch-2. (Brahma Reddy Battula via Yongjun Zhang) + HDFS-8597. Fix TestFSImage#testZeroBlockSize on Windows. (Xiaoyu Yao) + Release 2.7.0 - 2015-04-20 INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/StorageLocation.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/StorageLocation.java index 126086f3973..5c8dd85b2ca 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/StorageLocation.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/StorageLocation.java @@ -26,8 +26,8 @@ import java.util.regex.Matcher; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.StorageType; -import org.apache.hadoop.hdfs.server.common.Util; import org.apache.hadoop.util.StringUtils; /** @@ -94,7 +94,7 @@ public static StorageLocation parse(String rawLocation) } } - return new StorageLocation(storageType, Util.stringAsURI(location)); + return new StorageLocation(storageType, new Path(location).toUri()); } @Override