noslowerdna commented on a change in pull request #654: HADOOP-15183 S3Guard
store becomes inconsistent after partial failure of rename
URL: https://github.com/apache/hadoop/pull/654#discussion_r278569029
##########
File path:
hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AFailureHandling.java
##########
@@ -87,12 +100,86 @@ public void testMultiObjectDeleteSomeFiles() throws
Throwable {
timer.end("removeKeys");
}
+
+ private Path maybeGetCsvPath() {
+ Configuration conf = getConfiguration();
+ String csvFile = conf.getTrimmed(KEY_CSVTEST_FILE, DEFAULT_CSVTEST_FILE);
+ Assume.assumeTrue("CSV test file is not the default",
+ DEFAULT_CSVTEST_FILE.equals(csvFile));
+ return new Path(csvFile);
+ }
+
+ /**
+ * Test low-level failure handling with low level delete request.
+ */
@Test
public void testMultiObjectDeleteNoPermissions() throws Throwable {
- Path testFile = getLandsatCSVPath(getConfiguration());
- S3AFileSystem fs = (S3AFileSystem)testFile.getFileSystem(
+ describe("Delete the landsat CSV file and expect it to fail");
+ Path csvPath = maybeGetCsvPath();
+ S3AFileSystem fs =
(S3AFileSystem)csvPath.getFileSystem(getConfiguration());
+ List<DeleteObjectsRequest.KeyVersion> keys
+ = buildDeleteRequest(
+ new String[]{
+ fs.pathToKey(csvPath),
+ "missing-key.csv"
+ });
+ MultiObjectDeleteException ex = intercept(
+ MultiObjectDeleteException.class,
+ () -> fs.removeKeys(keys, false, false));
+
+ final List<Path> undeleted
+ = extractUndeletedPaths(ex, fs::keyToQualifiedPath);
+ String undeletedFiles = join(undeleted);
+ failIf(undeleted.size() != 2,
+ "undeleted list size wrong: " + undeletedFiles,
+ ex);
+ assertTrue("no CSV in " +undeletedFiles, undeleted.contains(csvPath));
+
+ // and a full split, after adding a new key
+ String marker = "/marker";
+ Path markerPath = fs.keyToQualifiedPath(marker);
+ keys.add(new DeleteObjectsRequest.KeyVersion(marker));
+
+ Pair<List<Path>, List<Path>> pair =
+ new MultiObjectDeleteSupport(fs.createStoreContext())
+ .splitUndeletedKeys(ex, keys);
+ assertEquals(undeleted, pair.getLeft());
+ List<Path> right = pair.getRight();
+ assertEquals("Wrong size for " + join(right), 1, right.size());
+ assertEquals(markerPath, right.get(0));
+ }
+
+ /**
+ * See what happens when you delete two entries which do not exist.
+ * The call succeeds; if
Review comment:
unfinished comment
----------------------------------------------------------------
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]
