big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-8958. ViewFs:Non absolute mount name failures when running multiple tests on Windows. Contributed by Chris Nauroth.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1415784 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2012-11-30 18:38:53 +00:00
parent 1573c1159a
commit bf7d772b79
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -453,6 +453,9 @@ Release 2.0.3-alpha - Unreleased
HADOOP-9064. Augment DelegationTokenRenewer API to cancel the tokens on HADOOP-9064. Augment DelegationTokenRenewer API to cancel the tokens on
calls to removeRenewAction. (kkambatl via tucu) calls to removeRenewAction. (kkambatl via tucu)
HADOOP-8958. ViewFs:Non absolute mount name failures when running
multiple tests on Windows. (Chris Nauroth via suresh)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

8
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java
View File

@ -26,6 +26,7 @@
import org.apache.hadoop.fs.FsConstants; import org.apache.hadoop.fs.FsConstants;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.viewfs.ConfigUtil; import org.apache.hadoop.fs.viewfs.ConfigUtil;
import org.apache.hadoop.util.Shell;
import org.mortbay.log.Log; import org.mortbay.log.Log;
@ -123,8 +124,11 @@ static void setUpHomeDir(Configuration conf, FileSystem fsTarget) {
* in the target file system. * in the target file system.
*/ */
static void linkUpFirstComponents(Configuration conf, String path, FileSystem fsTarget, String info) { static void linkUpFirstComponents(Configuration conf, String path, FileSystem fsTarget, String info) {
int indexOf2ndSlash = path.indexOf('/', 1); int indexOfEnd = path.indexOf('/', 1);
String firstComponent = path.substring(0, indexOf2ndSlash); if (Shell.WINDOWS) {
indexOfEnd = path.indexOf('/', indexOfEnd + 1);
}
String firstComponent = path.substring(0, indexOfEnd);
URI linkTarget = fsTarget.makeQualified(new Path(firstComponent)).toUri(); URI linkTarget = fsTarget.makeQualified(new Path(firstComponent)).toUri();
ConfigUtil.addLink(conf, firstComponent, linkTarget); ConfigUtil.addLink(conf, firstComponent, linkTarget);
Log.info("Added link for " + info + " " Log.info("Added link for " + info + " "

8
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFsTestSetup.java
View File

@ -25,6 +25,7 @@
import org.apache.hadoop.fs.FsConstants; import org.apache.hadoop.fs.FsConstants;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.viewfs.ConfigUtil; import org.apache.hadoop.fs.viewfs.ConfigUtil;
import org.apache.hadoop.util.Shell;
import org.mortbay.log.Log; import org.mortbay.log.Log;
@ -120,8 +121,11 @@ static void setUpHomeDir(Configuration conf, FileContext fsTarget) {
*/ */
static void linkUpFirstComponents(Configuration conf, String path, static void linkUpFirstComponents(Configuration conf, String path,
FileContext fsTarget, String info) { FileContext fsTarget, String info) {
int indexOf2ndSlash = path.indexOf('/', 1); int indexOfEnd = path.indexOf('/', 1);
String firstComponent = path.substring(0, indexOf2ndSlash); if (Shell.WINDOWS) {
indexOfEnd = path.indexOf('/', indexOfEnd + 1);
}
String firstComponent = path.substring(0, indexOfEnd);
URI linkTarget = fsTarget.makeQualified(new Path(firstComponent)).toUri(); URI linkTarget = fsTarget.makeQualified(new Path(firstComponent)).toUri();
ConfigUtil.addLink(conf, firstComponent, linkTarget); ConfigUtil.addLink(conf, firstComponent, linkTarget);
Log.info("Added link for " + info + " " Log.info("Added link for " + info + " "