Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -917,13 +917,9 @@ public void removeXAttr(Path path, String name) throws IOException {
}

@Override
public void setVerifyChecksum(final boolean verifyChecksum) {
List<InodeTree.MountPoint<FileSystem>> mountPoints =
fsState.getMountPoints();
Map<String, FileSystem> fsMap = initializeMountedFileSystems(mountPoints);
for (InodeTree.MountPoint<FileSystem> mount : mountPoints) {
fsMap.get(mount.src).setVerifyChecksum(verifyChecksum);
}
public void setVerifyChecksum(final boolean verifyChecksum) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the default impl. in FileSystem is already no-op. So the value of overriding is only in the comment. May be we should just remove this methods and add a comment to the jira explaining the change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still want to keep overriding the two methods in ViewFileSystem (same as ViewFs) so that we explicitly say these are no-ops and doesn't depend on the FileSystem implementation (if anything changes in future)

// This is a file system level operations, however ViewFileSystem
// points to many file systems. Noop for ViewFileSystem.
}

/**
Expand Down Expand Up @@ -1019,13 +1015,9 @@ public QuotaUsage getQuotaUsage(Path f) throws IOException {
}

@Override
public void setWriteChecksum(final boolean writeChecksum) {
List<InodeTree.MountPoint<FileSystem>> mountPoints =
fsState.getMountPoints();
Map<String, FileSystem> fsMap = initializeMountedFileSystems(mountPoints);
for (InodeTree.MountPoint<FileSystem> mount : mountPoints) {
fsMap.get(mount.src).setWriteChecksum(writeChecksum);
}
public void setWriteChecksum(final boolean writeChecksum) {
// This is a file system level operations, however ViewFileSystem
// points to many file systems. Noop for ViewFileSystem.
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@ public void testSanity() throws URISyntaxException {
assertEquals(new URI("fs2:/").getAuthority(), fs2.getUri().getAuthority());
}

@Test
public void testVerifyChecksum() throws Exception {
checkVerifyChecksum(false);
checkVerifyChecksum(true);
}

/**
* Tests that ViewFileSystem dispatches calls for every ACL method through the
* mount table to the correct underlying FileSystem with all Path arguments
Expand Down Expand Up @@ -144,12 +138,6 @@ public void testAclMethods() throws Exception {
verify(mockFs2).getAclStatus(mockFsPath2);
}

void checkVerifyChecksum(boolean flag) {
viewFs.setVerifyChecksum(flag);
assertEquals(flag, fs1.getVerifyChecksum());
assertEquals(flag, fs2.getVerifyChecksum());
}

static class FakeFileSystem extends LocalFileSystem {
boolean verifyChecksum = true;
URI uri;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1472,4 +1472,47 @@ public void testTargetFileSystemLazyInitialization() throws Exception {
// viewfs inner cache is disabled
assertEquals(cacheSize + 2, TestFileUtil.getCacheSize());
}

@Test
public void testTargetFileSystemLazyInitializationForChecksumMethods()
throws Exception {
final String clusterName = "cluster" + new Random().nextInt();
Configuration config = new Configuration(conf);
config.setBoolean(CONFIG_VIEWFS_ENABLE_INNER_CACHE, false);
config.setClass("fs.othermockfs.impl",
TestChRootedFileSystem.MockFileSystem.class, FileSystem.class);
ConfigUtil.addLink(config, clusterName, "/user",
URI.create("othermockfs://mockauth1/mockpath"));
ConfigUtil.addLink(config, clusterName,
"/mock", URI.create("othermockfs://mockauth/mockpath"));

final int cacheSize = TestFileUtil.getCacheSize();
ViewFileSystem viewFs = (ViewFileSystem) FileSystem.get(
new URI("viewfs://" + clusterName + "/"), config);

// As no inner file system instance has been initialized,
// cache size will remain the same
// cache is disabled for viewfs scheme, so the viewfs:// instance won't
// go in the cache even after the initialization
assertEquals(cacheSize, TestFileUtil.getCacheSize());

// This is not going to initialize any filesystem instance
viewFs.setVerifyChecksum(true);

// Cache size will remain the same
assertEquals(cacheSize, TestFileUtil.getCacheSize());

// This resolve path will initialize the file system corresponding
// to the mount table entry of the path "/user"
viewFs.getFileChecksum(
new Path(String.format("viewfs://%s/%s", clusterName, "/user")));

// Cache size will increase by 1.
assertEquals(cacheSize + 1, TestFileUtil.getCacheSize());

viewFs.close();
// Initialized FileSystem instances will not be removed from cache as
// viewfs inner cache is disabled
assertEquals(cacheSize + 1, TestFileUtil.getCacheSize());
}
}