From bf6379fdd2eef2fed30414559190afa8ccd963d5 Mon Sep 17 00:00:00 2001 From: Brahma Reddy Battula Date: Thu, 20 Oct 2016 21:47:17 +0530 Subject: [PATCH] HADOOP-13236. truncate will fail when we use viewfilesystem. Contributed by Brahma Reddy Battula (cherry picked from commit f872c6bc0390415f13e95b99749b0b1a690991b7) --- .../hadoop/fs/viewfs/ChRootedFileSystem.java | 5 + .../hadoop/fs/viewfs/ViewFileSystem.java | 2 +- .../TestViewFileSystemWithTruncate.java | 123 ++++++++++++++++++ 3 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithTruncate.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java index 46e8f2d4ba8..943846d725e 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java @@ -353,6 +353,11 @@ class ChRootedFileSystem extends FilterFileSystem { return super.getXAttrs(fullPath(path), names); } + @Override + public boolean truncate(Path path, long newLength) throws IOException { + return super.truncate(fullPath(path), newLength); + } + @Override public List listXAttrs(Path path) throws IOException { return super.listXAttrs(fullPath(path)); diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java index 37893d7ab58..0f090a59c17 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java @@ -505,7 +505,7 @@ public class ViewFileSystem extends FileSystem { throws IOException { InodeTree.ResolveResult res = fsState.resolve(getUriPath(f), true); - return res.targetFileSystem.truncate(f, newLength); + return res.targetFileSystem.truncate(res.remainingPath, newLength); } @Override diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithTruncate.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithTruncate.java new file mode 100644 index 00000000000..0b99cfea24a --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithTruncate.java @@ -0,0 +1,123 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.fs.viewfs; + +import java.io.IOException; + +import com.google.common.base.Supplier; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FSDataOutputStream; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.FileSystemTestHelper; +import org.apache.hadoop.fs.FsConstants; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hdfs.MiniDFSCluster; +import org.apache.hadoop.hdfs.MiniDFSNNTopology; +import org.apache.hadoop.test.GenericTestUtils; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Verify truncate through ViewFileSystem functionality. + * + */ +public class TestViewFileSystemWithTruncate { + private static MiniDFSCluster cluster; + private static Configuration clusterConf = new Configuration(); + private static FileSystem fHdfs; + private FileSystem fsView; + private Configuration fsViewConf; + private FileSystem fsTarget; + private Path targetTestRoot, mountOnNn1; + private FileSystemTestHelper fileSystemTestHelper = + new FileSystemTestHelper("/tmp/TestViewFileSystemWithXAttrs"); + + @BeforeClass + public static void clusterSetupAtBeginning() throws IOException { + cluster = new MiniDFSCluster.Builder(clusterConf) + .nnTopology(MiniDFSNNTopology.simpleFederatedTopology(2)) + .numDataNodes(2).build(); + cluster.waitClusterUp(); + + fHdfs = cluster.getFileSystem(0); + } + + @AfterClass + public static void clusterShutdownAtEnd() throws Exception { + if (cluster != null) { + cluster.shutdown(); + } + } + + @Before + public void setUp() throws Exception { + fsTarget = fHdfs; + targetTestRoot = fileSystemTestHelper.getAbsoluteTestRootPath(fsTarget); + + fsTarget.delete(targetTestRoot, true); + fsTarget.mkdirs(targetTestRoot); + + fsViewConf = ViewFileSystemTestSetup.createConfig(); + setupMountPoints(); + fsView = FileSystem.get(FsConstants.VIEWFS_URI, fsViewConf); + } + + private void setupMountPoints() { + mountOnNn1 = new Path("/mountOnNn1"); + ConfigUtil + .addLink(fsViewConf, mountOnNn1.toString(), targetTestRoot.toUri()); + } + + @After + public void tearDown() throws Exception { + fsTarget.delete(fileSystemTestHelper.getTestRootPath(fsTarget), true); + } + + @Test(timeout = 30000) + public void testTruncateWithViewFileSystem() + throws Exception { + Path filePath = new Path(mountOnNn1 + "/ttest"); + Path hdfFilepath = new Path("/tmp/TestViewFileSystemWithXAttrs/ttest"); + FSDataOutputStream out = fsView.create(filePath); + out.writeBytes("drtatedasfdasfgdfas"); + out.close(); + int newLength = 10; + boolean isReady = fsView.truncate(filePath, newLength); + if (!isReady) { + GenericTestUtils.waitFor(new Supplier() { + @Override + public Boolean get() { + try { + return cluster.getFileSystem(0).isFileClosed(hdfFilepath); + } catch (IOException e) { + return false; + } + } + }, 100, 60 * 1000); + } + // file length should be 10 after truncate + assertEquals(newLength, fsView.getFileStatus(filePath).getLen()); + } + +}