HDFS-8597. Fix TestFSImage#testZeroBlockSize on Windows. Contributed by Xiaoyu Yao.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/12b46e18 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/12b46e18 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/12b46e18 Branch: refs/heads/YARN-2928 Commit: 12b46e18e0094c46ca60e7f0ec4f333d4029a96c Parents: 090aa6c Author: Xiaoyu Yao <[email protected]> Authored: Tue Jun 16 12:38:07 2015 -0700 Committer: Zhijie Shen <[email protected]> Committed: Thu Jun 18 11:18:58 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../org/apache/hadoop/hdfs/server/datanode/StorageLocation.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/12b46e18/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 e0ef52f..42588cc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1024,6 +1024,8 @@ Release 2.7.1 - UNRELEASED HDFS-8576. Lease recovery should return true if the lease can be released and the file can be closed. (J.Andreina via szetszwo) + HDFS-8597. Fix TestFSImage#testZeroBlockSize on Windows. (Xiaoyu Yao) + Release 2.7.0 - 2015-04-20 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/12b46e18/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/StorageLocation.java ---------------------------------------------------------------------- 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 126086f..5c8dd85 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.net.URI; 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 class StorageLocation { } } - return new StorageLocation(storageType, Util.stringAsURI(location)); + return new StorageLocation(storageType, new Path(location).toUri()); } @Override
