jojochuang commented on a change in pull request #1111: HDFS-9913 DistCp to add
-useTrash to move deleted files to Trash
URL: https://github.com/apache/hadoop/pull/1111#discussion_r348156574
##########
File path:
hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
##########
@@ -279,6 +282,61 @@ public void testPreserveTimeWithDeleteMiss() throws
IOException {
}
+ @Test
+ public void testDeleteUseTrash() throws IOException {
+ TaskAttemptContext taskAttemptContext = getTaskAttemptContext(config);
+ JobContext jobContext = new JobContextImpl(
+ taskAttemptContext.getConfiguration(),
+ taskAttemptContext.getTaskAttemptID().getJobID());
+ Configuration conf = jobContext.getConfiguration();
+
+ String sourceBase;
+ String targetBase;
+ FileSystem fs = null;
+ try {
+ OutputCommitter committer = new CopyCommitter(null, taskAttemptContext);
+ fs = FileSystem.get(conf);
+ sourceBase = TestDistCpUtils.createTestSetup(fs);
+ targetBase = TestDistCpUtils.createTestSetup(fs);
+ String targetBaseAdd = TestDistCpUtils.createTestSetup(fs);
+ ContractTestUtils.assertRenameOutcome(fs, new Path(targetBaseAdd),
+ new Path(targetBase),true);
+
+ DistCpOptions.Builder builder = new DistCpOptions.Builder(
+ Arrays.asList(new Path(sourceBase)), new Path("/out"));
+ builder.withSyncFolder(true);
+ builder.withDeleteMissing(true);
+ builder.withDeleteUseTrash(true);
+ builder.build().appendToConf(conf);
+ DistCpContext cpContext = new DistCpContext(builder.build());
+
+ CopyListing listing = new GlobbedCopyListing(conf, CREDENTIALS);
+ Path listingFile = new Path("/tmp1/" + String.valueOf(rand.nextLong()));
+ listing.buildListing(listingFile, cpContext);
+
+ conf.set(DistCpConstants.CONF_LABEL_TARGET_WORK_PATH, targetBase);
+ conf.set(DistCpConstants.CONF_LABEL_TARGET_FINAL_PATH, targetBase);
+
+ Path trashRootDir = fs.getTrashRoot(null);
+ if (fs.exists(trashRootDir)) {
+ fs.delete(trashRootDir, true);
+ }
+ committer.commitJob(jobContext);
+
+ verifyFoldersAreInSync(fs, targetBase, sourceBase);
+ verifyFoldersAreInSync(fs, sourceBase, targetBase);
+
+ Assert.assertTrue("Path delete does not use trash",
+ fs.exists(trashRootDir));
+ Path trashDir = new Path(trashRootDir, "Current" + targetBaseAdd);
+ verifyFoldersAreInSync(fs, trashDir.toString(), sourceBase);
+ } finally {
+ TestDistCpUtils.delete(fs, "/tmp1");
+ conf.set(DistCpConstants.CONF_LABEL_DELETE_MISSING, "false");
+ conf.set(DistCpConstants.CONF_LABEL_DELETE_MISSING_USETRASH, "false");
Review comment:
close fs object too
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
