Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-8597. Fix TestFSImage#testZeroBlockSize on Windows. Contributed by Xiaoyu Yao. 

(cherry picked from commit 4e88ff5b27)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
This commit is contained in:
Xiaoyu Yao 2015-06-16 12:38:07 -07:00
parent eb8e2c5448
commit d7c8a6feaa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -687,6 +687,8 @@ Release 2.7.1 - UNRELEASED
HDFS-8544. Incorrect port specified in HFTP Guide document in branch-2. HDFS-8544. Incorrect port specified in HFTP Guide document in branch-2.
(Brahma Reddy Battula via Yongjun Zhang) (Brahma Reddy Battula via Yongjun Zhang)
HDFS-8597. Fix TestFSImage#testZeroBlockSize on Windows. (Xiaoyu Yao)
Release 2.7.0 - 2015-04-20 Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/StorageLocation.java
View File

@ -26,8 +26,8 @@ import java.net.URI;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.StorageType; import org.apache.hadoop.fs.StorageType;
import org.apache.hadoop.hdfs.server.common.Util;
import org.apache.hadoop.util.StringUtils; 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 @Override