HADOOP-8013 ViewFileSystem does not honor setVerifyChecksum (Dayrn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240383 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans
parent
fdc47f7833
commit
da00476fca
|
|
@ -83,6 +83,9 @@ Trunk (unreleased changes)
|
|||
kerberos. (jitendra)
|
||||
|
||||
BUG FIXES
|
||||
HADOOP-8013. ViewFileSystem does not honor setVerifyChecksum
|
||||
(Daryn Sharp via bobby)
|
||||
|
||||
HADOOP-8018. Hudson auto test for HDFS has started throwing javadoc
|
||||
(Jon Eagles via bobby)
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ package org.apache.hadoop.fs;
|
|||
|
||||
import java.io.*;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -51,6 +52,7 @@ import org.apache.hadoop.util.Progressable;
|
|||
public class FilterFileSystem extends FileSystem {
|
||||
|
||||
protected FileSystem fs;
|
||||
private String swapScheme;
|
||||
|
||||
/*
|
||||
* so that extending classes can define it
|
||||
|
|
@ -77,7 +79,11 @@ public class FilterFileSystem extends FileSystem {
|
|||
* @param conf the configuration
|
||||
*/
|
||||
public void initialize(URI name, Configuration conf) throws IOException {
|
||||
fs.initialize(name, conf);
|
||||
super.initialize(name, conf);
|
||||
String scheme = name.getScheme();
|
||||
if (!scheme.equals(fs.getUri().getScheme())) {
|
||||
swapScheme = scheme;
|
||||
}
|
||||
}
|
||||
|
||||
/** Returns a URI whose scheme and authority identify this FileSystem.*/
|
||||
|
|
@ -96,7 +102,19 @@ public class FilterFileSystem extends FileSystem {
|
|||
|
||||
/** Make sure that a path specifies a FileSystem. */
|
||||
public Path makeQualified(Path path) {
|
||||
return fs.makeQualified(path);
|
||||
Path fqPath = fs.makeQualified(path);
|
||||
// swap in our scheme if the filtered fs is using a different scheme
|
||||
if (swapScheme != null) {
|
||||
try {
|
||||
// NOTE: should deal with authority, but too much other stuff is broken
|
||||
fqPath = new Path(
|
||||
new URI(swapScheme, fqPath.toUri().getSchemeSpecificPart(), null)
|
||||
);
|
||||
} catch (URISyntaxException e) {
|
||||
throw new IllegalArgumentException(e);
|
||||
}
|
||||
}
|
||||
return fqPath;
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import java.util.*;
|
|||
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.classification.InterfaceStability;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
|
||||
/****************************************************************
|
||||
* Implement the FileSystem API for the checksumed local filesystem.
|
||||
|
|
@ -34,19 +35,24 @@ import org.apache.hadoop.classification.InterfaceStability;
|
|||
public class LocalFileSystem extends ChecksumFileSystem {
|
||||
static final URI NAME = URI.create("file:///");
|
||||
static private Random rand = new Random();
|
||||
FileSystem rfs;
|
||||
|
||||
public LocalFileSystem() {
|
||||
this(new RawLocalFileSystem());
|
||||
}
|
||||
|
||||
public FileSystem getRaw() {
|
||||
return rfs;
|
||||
return getRawFileSystem();
|
||||
}
|
||||
|
||||
public LocalFileSystem(FileSystem rawLocalFileSystem) {
|
||||
super(rawLocalFileSystem);
|
||||
rfs = rawLocalFileSystem;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(URI uri, Configuration conf) throws IOException {
|
||||
super.initialize(uri, conf);
|
||||
// ctor didn't initialize the filtered fs
|
||||
getRawFileSystem().initialize(uri, conf);
|
||||
}
|
||||
|
||||
/** Convert a path to a File. */
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ package org.apache.hadoop.fs.viewfs;
|
|||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.classification.InterfaceStability;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
|
|
@ -82,37 +80,16 @@ class ChRootedFileSystem extends FilterFileSystem {
|
|||
|
||||
/**
|
||||
* Constructor
|
||||
* @param fs base file system
|
||||
* @param theRoot chRoot for this file system
|
||||
* @throws URISyntaxException
|
||||
* @param uri base file system
|
||||
* @param conf configuration
|
||||
* @throws IOException
|
||||
*/
|
||||
public ChRootedFileSystem(final FileSystem fs, final Path theRoot)
|
||||
throws URISyntaxException {
|
||||
super(fs);
|
||||
makeQualified(theRoot); //check that root is a valid path for fs
|
||||
// Would like to call myFs.checkPath(theRoot);
|
||||
// but not public
|
||||
chRootPathPart = new Path(theRoot.toUri().getPath());
|
||||
public ChRootedFileSystem(final URI uri, Configuration conf)
|
||||
throws IOException {
|
||||
super(FileSystem.get(uri, conf));
|
||||
chRootPathPart = new Path(uri.getPath());
|
||||
chRootPathPartString = chRootPathPart.toUri().getPath();
|
||||
try {
|
||||
initialize(fs.getUri(), fs.getConf());
|
||||
} catch (IOException e) { // This exception should not be thrown
|
||||
throw new RuntimeException("This should not occur");
|
||||
}
|
||||
|
||||
/*
|
||||
* We are making URI include the chrootedPath: e.g. file:///chrootedPath.
|
||||
* This is questionable since Path#makeQualified(uri, path) ignores
|
||||
* the pathPart of a uri. Since this class is internal we can ignore
|
||||
* this issue but if we were to make it external then this needs
|
||||
* to be resolved.
|
||||
*/
|
||||
// Handle the two cases:
|
||||
// scheme:/// and scheme://authority/
|
||||
myUri = new URI(fs.getUri().toString() +
|
||||
(fs.getUri().getAuthority() == null ? "" : Path.SEPARATOR) +
|
||||
chRootPathPart.toString().substring(1));
|
||||
|
||||
myUri = uri;
|
||||
workingDir = getHomeDirectory();
|
||||
// We don't use the wd of the myFs
|
||||
}
|
||||
|
|
|
|||
|
|
@ -168,8 +168,7 @@ public class ViewFileSystem extends FileSystem {
|
|||
protected
|
||||
FileSystem getTargetFileSystem(final URI uri)
|
||||
throws URISyntaxException, IOException {
|
||||
return new ChRootedFileSystem(FileSystem.get(uri, config),
|
||||
new Path(uri.getPath()));
|
||||
return new ChRootedFileSystem(uri, config);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -464,8 +463,11 @@ public class ViewFileSystem extends FileSystem {
|
|||
|
||||
@Override
|
||||
public void setVerifyChecksum(final boolean verifyChecksum) {
|
||||
// This is a file system level operations, however ViewFileSystem
|
||||
// points to many file systems. Noop for ViewFileSystem.
|
||||
List<InodeTree.MountPoint<FileSystem>> mountPoints =
|
||||
fsState.getMountPoints();
|
||||
for (InodeTree.MountPoint<FileSystem> mount : mountPoints) {
|
||||
mount.target.targetFileSystem.setVerifyChecksum(verifyChecksum);
|
||||
}
|
||||
}
|
||||
|
||||
public MountPoint[] getMountPoints() {
|
||||
|
|
|
|||
|
|
@ -72,14 +72,15 @@ public final class FileSystemTestHelper {
|
|||
|
||||
public static String getAbsoluteTestRootDir(FileSystem fSys)
|
||||
throws IOException {
|
||||
if (absTestRootDir == null) {
|
||||
// NOTE: can't cache because of different filesystems!
|
||||
//if (absTestRootDir == null)
|
||||
if (TEST_ROOT_DIR.startsWith("/")) {
|
||||
absTestRootDir = TEST_ROOT_DIR;
|
||||
} else {
|
||||
absTestRootDir = fSys.getWorkingDirectory().toString() + "/"
|
||||
+ TEST_ROOT_DIR;
|
||||
}
|
||||
}
|
||||
//}
|
||||
return absTestRootDir;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ public class TestChRootedFileSystem {
|
|||
|
||||
|
||||
// ChRoot to the root of the testDirectory
|
||||
fSys = new ChRootedFileSystem(fSysTarget, chrootedTo);
|
||||
fSys = new ChRootedFileSystem(chrootedTo.toUri(), conf);
|
||||
}
|
||||
|
||||
@After
|
||||
|
|
|
|||
Loading…
Reference in New Issue