Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HADOOP-17122: Preserving Directory Attributes in DistCp with Atomic Copy #2133

Merged
merged 6 commits into from
Aug 22, 2020
Merged

HADOOP-17122: Preserving Directory Attributes in DistCp with Atomic Copy #2133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10d0fab
HADOOP-17122: Preserving Directory Attributes in DistCp with Atomic Copy
swaminathan-b Jul 11, 2020
166ec38
HADOOP-17122: Addressing Review Comments for Preserving Directory At…
swaminathan-b Aug 11, 2020
f97e6f7
HADOOP-17122: Restoring new line at the end
swaminathan-b Aug 13, 2020
c4ad2f7
HADOOP-17122: Removing Whitespace from Added New line
swaminathan-b Aug 13, 2020
eeff2e6
HADOOP-17122: Correcting Whitespace checks
swaminathan-b Aug 19, 2020
987a9aa
HADOOP-17122: Correcting Whitespace checks
swaminathan-b Aug 19, 2020
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
6 changes: 4 additions & 2 deletions hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,10 @@ private void preserveFileAttributesForDirectories(Configuration conf)
SequenceFile.Reader sourceReader = new SequenceFile.Reader(conf,
SequenceFile.Reader.file(sourceListing));
long totalLen = clusterFS.getFileStatus(sourceListing).getLen();

Path targetRoot = new Path(conf.get(DistCpConstants.CONF_LABEL_TARGET_WORK_PATH));
// For Atomic Copy the Final & Work Path are different & atomic copy has
// already moved it to final path.
Path targetRoot =
new Path(conf.get(DistCpConstants.CONF_LABEL_TARGET_FINAL_PATH));

long preservedEntries = 0;
try {
Expand Down
69 changes: 55 additions & 14 deletions ...p-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
import java.util.*;

import static org.apache.hadoop.fs.contract.ContractTestUtils.*;
import static org.apache.hadoop.tools.DistCpConstants.CONF_LABEL_TARGET_FINAL_PATH;
import static org.apache.hadoop.tools.DistCpConstants.CONF_LABEL_TARGET_WORK_PATH;
import static org.apache.hadoop.tools.util.TestDistCpUtils.*;

public class TestCopyCommitter {
Expand Down Expand Up @@ -160,10 +162,10 @@ public void testPreserveStatus() throws IOException {
context.setTargetPathExists(false);

CopyListing listing = new GlobbedCopyListing(conf, CREDENTIALS);
Path listingFile = new Path("/tmp1/" + String.valueOf(rand.nextLong()));
Path listingFile = new Path("/tmp1/" + rand.nextLong());
swamirishi marked this conversation as resolved.
Show resolved Hide resolved
listing.buildListing(listingFile, context);

conf.set(DistCpConstants.CONF_LABEL_TARGET_WORK_PATH, targetBase);
conf.set(CONF_LABEL_TARGET_FINAL_PATH, targetBase);

committer.commitJob(jobContext);
checkDirectoryPermissions(fs, targetBase, sourcePerm);
Expand All @@ -179,6 +181,45 @@ public void testPreserveStatus() throws IOException {

}

@Test
swamirishi marked this conversation as resolved.
Show resolved Hide resolved
public void testPreserveStatusWithAtomicCommit() throws IOException {
TaskAttemptContext taskAttemptContext = getTaskAttemptContext(config);
JobContext jobContext = new JobContextImpl(
taskAttemptContext.getConfiguration(),
taskAttemptContext.getTaskAttemptID().getJobID());
Configuration conf = jobContext.getConfiguration();
String sourceBase;
String workBase;
String targetBase;
FileSystem fs = null;
try {
OutputCommitter committer = new CopyCommitter(null, taskAttemptContext);
fs = FileSystem.get(conf);
steveloughran marked this conversation as resolved.
Show resolved Hide resolved
FsPermission sourcePerm = new FsPermission((short) 511);
FsPermission initialPerm = new FsPermission((short) 448);
sourceBase = TestDistCpUtils.createTestSetup(fs, sourcePerm);
workBase = TestDistCpUtils.createTestSetup(fs, initialPerm);
targetBase = "/tmp1/" + rand.nextLong();
final DistCpOptions options = new DistCpOptions.Builder(
Collections.singletonList(new Path(sourceBase)), new Path("/out"))
.preserve(FileAttribute.PERMISSION).build();
options.appendToConf(conf);
final DistCpContext context = new DistCpContext(options);
context.setTargetPathExists(false);
CopyListing listing = new GlobbedCopyListing(conf, CREDENTIALS);
Path listingFile = new Path("/tmp1/" + rand.nextLong());
listing.buildListing(listingFile, context);
conf.set(CONF_LABEL_TARGET_FINAL_PATH, targetBase);
conf.set(CONF_LABEL_TARGET_WORK_PATH, workBase);
conf.setBoolean(DistCpConstants.CONF_LABEL_ATOMIC_COPY, true);
committer.commitJob(jobContext);
checkDirectoryPermissions(fs, targetBase, sourcePerm);
} finally {
TestDistCpUtils.delete(fs, "/tmp1");
conf.unset(DistCpConstants.CONF_LABEL_PRESERVE_STATUS);
}
}

@Test
public void testDeleteMissing() throws IOException {
TaskAttemptContext taskAttemptContext = getTaskAttemptContext(config);
Expand Down Expand Up @@ -207,8 +248,8 @@ public void testDeleteMissing() throws IOException {
Path listingFile = new Path("/tmp1/" + String.valueOf(rand.nextLong()));
listing.buildListing(listingFile, context);

conf.set(DistCpConstants.CONF_LABEL_TARGET_WORK_PATH, targetBase);
conf.set(DistCpConstants.CONF_LABEL_TARGET_FINAL_PATH, targetBase);
conf.set(CONF_LABEL_TARGET_WORK_PATH, targetBase);
conf.set(CONF_LABEL_TARGET_FINAL_PATH, targetBase);

committer.commitJob(jobContext);
verifyFoldersAreInSync(fs, targetBase, sourceBase);
Expand Down Expand Up @@ -256,8 +297,8 @@ public void testPreserveTimeWithDeleteMiss() throws IOException {
Path listingFile = new Path("/tmp1/" + String.valueOf(rand.nextLong()));
listing.buildListing(listingFile, context);

conf.set(DistCpConstants.CONF_LABEL_TARGET_WORK_PATH, targetBase);
conf.set(DistCpConstants.CONF_LABEL_TARGET_FINAL_PATH, targetBase);
conf.set(CONF_LABEL_TARGET_WORK_PATH, targetBase);
conf.set(CONF_LABEL_TARGET_FINAL_PATH, targetBase);

Path sourceListing = new Path(
conf.get(DistCpConstants.CONF_LABEL_LISTING_FILE_PATH));
Expand Down Expand Up @@ -320,8 +361,8 @@ public void testDeleteMissingFlatInterleavedFiles() throws IOException {
Path listingFile = new Path("/tmp1/" + String.valueOf(rand.nextLong()));
listing.buildListing(listingFile, context);

conf.set(DistCpConstants.CONF_LABEL_TARGET_WORK_PATH, targetBase);
conf.set(DistCpConstants.CONF_LABEL_TARGET_FINAL_PATH, targetBase);
conf.set(CONF_LABEL_TARGET_WORK_PATH, targetBase);
conf.set(CONF_LABEL_TARGET_FINAL_PATH, targetBase);

committer.commitJob(jobContext);
verifyFoldersAreInSync(fs, targetBase, sourceBase);
Expand Down Expand Up @@ -353,8 +394,8 @@ public void testAtomicCommitMissingFinal() throws IOException {
fs = FileSystem.get(conf);
fs.mkdirs(new Path(workPath));

conf.set(DistCpConstants.CONF_LABEL_TARGET_WORK_PATH, workPath);
conf.set(DistCpConstants.CONF_LABEL_TARGET_FINAL_PATH, finalPath);
conf.set(CONF_LABEL_TARGET_WORK_PATH, workPath);
conf.set(CONF_LABEL_TARGET_FINAL_PATH, finalPath);
conf.setBoolean(DistCpConstants.CONF_LABEL_ATOMIC_COPY, true);

assertPathExists(fs, "Work path", new Path(workPath));
Expand Down Expand Up @@ -391,8 +432,8 @@ public void testAtomicCommitExistingFinal() throws IOException {
fs.mkdirs(new Path(workPath));
fs.mkdirs(new Path(finalPath));

conf.set(DistCpConstants.CONF_LABEL_TARGET_WORK_PATH, workPath);
conf.set(DistCpConstants.CONF_LABEL_TARGET_FINAL_PATH, finalPath);
conf.set(CONF_LABEL_TARGET_WORK_PATH, workPath);
conf.set(CONF_LABEL_TARGET_FINAL_PATH, finalPath);
conf.setBoolean(DistCpConstants.CONF_LABEL_ATOMIC_COPY, true);

assertPathExists(fs, "Work path", new Path(workPath));
Expand Down Expand Up @@ -463,8 +504,8 @@ private void testCommitWithChecksumMismatch(boolean skipCrc)
+ String.valueOf(rand.nextLong()));
listing.buildListing(listingFile, context);

conf.set(DistCpConstants.CONF_LABEL_TARGET_WORK_PATH, targetBase);
conf.set(DistCpConstants.CONF_LABEL_TARGET_FINAL_PATH, targetBase);
conf.set(CONF_LABEL_TARGET_WORK_PATH, targetBase);
conf.set(CONF_LABEL_TARGET_FINAL_PATH, targetBase);

OutputCommitter committer = new CopyCommitter(
null, taskAttemptContext);
Expand Down