This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new aa87395bad HDDS-9320. Ozone delete key with error log during Spark job
completion (#5321)
aa87395bad is described below
commit aa87395bade650ae206aacd6fbf7e3f9d81d2f7e
Author: Sumit Agrawal <[email protected]>
AuthorDate: Tue Sep 26 22:57:13 2023 +0530
HDDS-9320. Ozone delete key with error log during Spark job completion
(#5321)
* HDDS-9110. Bucket owner is getting unset on setting quota on that bucket
* HDDS-9320. Ozone delete key with error log during Spark job completion
---------
Co-authored-by: sumitagrawal <[email protected]>
---
.../apache/hadoop/fs/ozone/TestOzoneFileSystemWithFSO.java | 11 +++++++++++
.../apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java | 4 ++++
2 files changed, 15 insertions(+)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithFSO.java
index ce637f8ea9..0a4d2cecb1 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithFSO.java
@@ -589,6 +589,17 @@ public class TestOzoneFileSystemWithFSO extends
TestOzoneFileSystem {
assertTrue(fs.isFileClosed(source));
}
+ @Test
+ public void testFSDeleteLogWarnNoExist() throws Exception {
+ GenericTestUtils.LogCapturer logCapture = GenericTestUtils.LogCapturer
+ .captureLogs(BasicOzoneClientAdapterImpl.LOG);
+ getFs().delete(new Path("/d1/d3/noexist/"), true);
+ assertTrue(logCapture.getOutput().contains(
+ "delete key failed Unable to get file status"));
+ assertTrue(logCapture.getOutput().contains(
+ "WARN ozone.BasicOzoneClientAdapterImpl"));
+ }
+
private void verifyOMFileInfoFormat(OmKeyInfo omKeyInfo, String fileName,
long parentID) {
Assert.assertEquals("Wrong keyName", fileName, omKeyInfo.getKeyName());
diff --git
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
index b79a24b356..1db9885f7d 100644
---
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
+++
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
@@ -357,6 +357,10 @@ public class BasicOzoneClientAdapterImpl implements
OzoneClientAdapter {
bucket.deleteDirectory(keyName, recursive);
return true;
} catch (OMException ome) {
+ if (OMException.ResultCodes.KEY_NOT_FOUND == ome.getResult()) {
+ LOG.warn("delete key failed {}", ome.getMessage());
+ return false;
+ }
LOG.error("delete key failed {}", ome.getMessage());
if (OMException.ResultCodes.DIRECTORY_NOT_EMPTY == ome.getResult()) {
throw new PathIsNotEmptyDirectoryException(ome.getMessage());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
