[
https://issues.apache.org/jira/browse/HADOOP-17139?focusedWorklogId=623618&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-623618
]
ASF GitHub Bot logged work on HADOOP-17139:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 16/Jul/21 14:20
Start Date: 16/Jul/21 14:20
Worklog Time Spent: 10m
Work Description: bogthe commented on a change in pull request #3101:
URL: https://github.com/apache/hadoop/pull/3101#discussion_r671293339
##########
File path:
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCopyFromLocalTest.java
##########
@@ -0,0 +1,315 @@
+/*
+ * 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.contract;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.PathExistsException;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+
+import static org.apache.hadoop.test.LambdaTestUtils.intercept;
+
+public abstract class AbstractContractCopyFromLocalTest extends
+ AbstractFSContractTestBase {
+
+ private static final Charset ASCII = StandardCharsets.US_ASCII;
+ private File file;
+
+ @Override
+ public void teardown() throws Exception {
+ super.teardown();
+ if (file != null) {
+ file.delete();
+ }
+ }
+
+ @Test
+ public void testCopyEmptyFile() throws Throwable {
+ file = File.createTempFile("test", ".txt");
+ Path dest = copyFromLocal(file, true);
+ assertPathExists("uploaded file", dest);
+ }
+
+ @Test
+ public void testCopyFile() throws Throwable {
+ String message = "hello";
+ file = createTempFile(message);
+ Path dest = copyFromLocal(file, true);
+
+ assertPathExists("uploaded file not found", dest);
+ assertTrue("source file deleted", Files.exists(file.toPath()));
+
+ FileSystem fs = getFileSystem();
+ FileStatus status = fs.getFileStatus(dest);
+ assertEquals("File length of " + status,
+ message.getBytes(ASCII).length, status.getLen());
+ assertFileTextEquals(dest, message);
+ }
+
+ @Test
+ public void testCopyFileNoOverwrite() throws Throwable {
+ file = createTempFile("hello");
+ copyFromLocal(file, true);
+ intercept(PathExistsException.class,
+ () -> copyFromLocal(file, false));
+ }
+
+ @Test
+ public void testCopyFileOverwrite() throws Throwable {
+ file = createTempFile("hello");
+ Path dest = copyFromLocal(file, true);
+ String updated = "updated";
+ FileUtils.write(file, updated, ASCII);
+ copyFromLocal(file, true);
+ assertFileTextEquals(dest, updated);
+ }
+
+ @Test
+ public void testCopyMissingFile() throws Throwable {
+ describe("Copying a file that's not there should fail.");
+ file = createTempFile("test");
+ file.delete();
+ // first upload to create
+ intercept(FileNotFoundException.class, "",
+ () -> copyFromLocal(file, true));
+ }
+
+ @Test
+ public void testSourceIsFileAndDelSrcTrue() throws Throwable {
+ describe("Source is a file delSrc flag is set to true");
+
+ file = createTempFile("test");
+ copyFromLocal(file, false, true);
+
+ assertFalse("uploaded file", Files.exists(file.toPath()));
+ }
+
+ @Test
+ public void testSourceIsFileAndDestinationIsDirectory() throws Throwable {
+ describe("Source is a file and destination is a directory. File" +
+ "should be copied inside the directory.");
+
+ file = createTempFile("test");
+ Path source = new Path(file.toURI());
+ FileSystem fs = getFileSystem();
+
+ File dir = createTempDirectory("test");
+ Path destination = fileToPath(dir);
+ fs.delete(destination, false);
+ mkdirs(destination);
+
+ fs.copyFromLocalFile(source, destination);
+ }
+
+ @Test
+ public void testSourceIsFileAndDestinationIsNonExistentDirectory()
+ throws Throwable {
+ describe("Source is a file and destination directory does not exist. " +
+ "Copy operation should still work.");
+
+ file = createTempFile("test");
+ Path source = new Path(file.toURI());
+ FileSystem fs = getFileSystem();
+
+ File dir = createTempDirectory("test");
+ Path destination = fileToPath(dir);
+ fs.delete(destination, false);
+
+ fs.copyFromLocalFile(source, destination);
+ assertPathExists("Destination should exist.", destination);
+ }
+
+ @Test
+ public void testSrcIsDirWithFilesAndCopySuccessful() throws Throwable {
+ describe("Source is a directory with files, copy should copy all" +
+ " dir contents to source");
+ String firstChild = "childOne";
+ String secondChild = "childTwo";
+ File parent = createTempDirectory("parent");
+ File root = parent.getParentFile();
+ File childFile = createTempFile(parent, firstChild, firstChild);
+ File secondChildFile = createTempFile(parent, secondChild, secondChild);
+
+ copyFromLocal(parent, false);
+
+ assertPathExists("Parent directory not copied", fileToPath(parent));
+ assertFileTextEquals(fileToPath(childFile, root), firstChild);
+ assertFileTextEquals(fileToPath(secondChildFile, root), secondChild);
+ }
+
+ @Test
+ public void testSrcIsEmptyDirWithCopySuccessful() throws Throwable {
+ describe("Source is an empty directory, copy should succeed");
+ File source = createTempDirectory("source");
+ Path dest = copyFromLocal(source, false);
+
+ assertPathExists("Empty directory not copied", dest);
+ }
+
+ @Test
+ public void testSrcIsDirWithOverwriteOptions() throws Throwable {
+ describe("Source is a directory, destination exists and" +
+ "should be overwritten.");
+ // Disabling checksum because overwriting directories does not
+ // overwrite checksums
+ FileSystem fs = getFileSystem();
Review comment:
Hah! Now that you mention it, I looked at it a bit closer and I found
that the following "interesting" differences:
- `fs.copyFromLocalFile(sourcePath, dest);` uses `ChecksumFileSystem` to
write data;
- `fs.copyFromLocalFile(false, true, sourcePath, dest);` falls back to
`RawLocalFileSystem` which doesn't update the checksums;
Is this intended or should I update `ChecksumFileSystem` to support the
different method calls for `copyFromLocalFile`?
I would like to update it, however let me know if this would break anything.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 623618)
Time Spent: 5.5h (was: 5h 20m)
> Re-enable optimized copyFromLocal implementation in S3AFileSystem
> -----------------------------------------------------------------
>
> Key: HADOOP-17139
> URL: https://issues.apache.org/jira/browse/HADOOP-17139
> Project: Hadoop Common
> Issue Type: Sub-task
> Components: fs/s3
> Affects Versions: 3.3.0, 3.2.1
> Reporter: Sahil Takiar
> Assignee: Bogdan Stolojan
> Priority: Minor
> Labels: pull-request-available
> Time Spent: 5.5h
> Remaining Estimate: 0h
>
> It looks like HADOOP-15932 disabled the optimized copyFromLocal
> implementation in S3A for correctness reasons. innerCopyFromLocalFile should
> be fixed and re-enabled. The current implementation uses
> FileSystem.copyFromLocal which will open an input stream from the local fs
> and an output stream to the destination fs, and then call IOUtils.copyBytes.
> With default configs, this will cause S3A to read the file into memory, write
> it back to a file on the local fs, and then when the file is closed, upload
> it to S3.
> The optimized version of copyFromLocal in innerCopyFromLocalFile, directly
> creates a PutObjectRequest request with the local file as the input.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org
