HDDS-11784 get the parent id for MPU even it is missing parent direct…

…ories
apache · Jan 14, 2025 · a0c6305 · a0c6305
1 parent 147318b
commit a0c6305
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...p-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java b/...p-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
@@ -899,11 +899,13 @@ public String getMultipartKeyFSO(String volume, String bucket, String key, Strin
     final long volumeId = getVolumeId(volume);
     final long bucketId = getBucketId(volume,
             bucket);
-    long parentId =
-            OMFileRequest.getParentID(volumeId, bucketId, key, this);
+    final String nonFSOMultipartKey =
+        getMultipartKey(volume, bucket, key, uploadId);
+    final OmMultipartKeyInfo multipartKeyInfo =
+        getMultipartInfoTable().get(nonFSOMultipartKey);
+    long parentId = multipartKeyInfo.getParentID();
 
     String fileName = OzoneFSUtils.getFileName(key);
-
     return getMultipartKey(volumeId, bucketId, parentId,
             fileName, uploadId);
   }

diff --git a/...pache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java b/...pache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java
@@ -47,7 +47,7 @@
  * 3) Delete unused parts.
  */
 @CleanupTableInfo(cleanupTables = {OPEN_FILE_TABLE, FILE_TABLE, DELETED_TABLE,
-    MULTIPARTINFO_TABLE})
+    MULTIPARTINFO_TABLE, DELETED_TABLE})
 public class S3MultipartUploadCompleteResponseWithFSO
         extends S3MultipartUploadCompleteResponse {