HDDS-12131. NPE in OM when overwriting empty file using multipart upl…

…oad (#7739)
apache · Jan 24, 2025 · db059c6 · db059c6
1 parent c0a6ffd
commit db059c6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/hadoop-ozone/dist/src/main/smoketest/s3/MultipartUpload.robot b/hadoop-ozone/dist/src/main/smoketest/s3/MultipartUpload.robot
@@ -61,6 +61,12 @@ Test Multipart Upload With Adjusted Length
     Perform Multipart Upload    ${BUCKET}    multipart/adjusted_length_${PREFIX}    /tmp/part1    /tmp/part2
     Verify Multipart Upload     ${BUCKET}    multipart/adjusted_length_${PREFIX}    /tmp/part1    /tmp/part2
 
+Overwrite Empty File
+    Execute                     touch ${TEMP_DIR}/empty
+    Execute AWSS3Cli            cp ${TEMP_DIR}/empty s3://${BUCKET}/empty_file_${PREFIX}
+    Perform Multipart Upload    ${BUCKET}    empty_file_${PREFIX}    /tmp/part1    /tmp/part2
+    Verify Multipart Upload     ${BUCKET}    empty_file_${PREFIX}    /tmp/part1    /tmp/part2
+
 Test Multipart Upload
     ${uploadID} =       Initiate MPU    ${BUCKET}    ${PREFIX}/multipartKey
     ${nextUploadID} =   Initiate MPU    ${BUCKET}    ${PREFIX}/multipartKey

diff --git a/...a/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java b/...a/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java
@@ -33,6 +33,7 @@
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
 import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.BUCKET_TABLE;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DELETED_TABLE;
@@ -130,6 +131,7 @@ protected OmKeyInfo getOmKeyInfo() {
     return omKeyInfo;
   }
 
+  @Nullable
   protected OmBucketInfo getOmBucketInfo() {
     return omBucketInfo;
   }

diff --git a/...pache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java b/...pache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java
@@ -102,11 +102,14 @@ public void addToDBBatch(OMMetadataManager omMetadataManager,
       }
 
       // namespace quota changes for parent directory
-      String bucketKey = omMetadataManager.getBucketKey(
-          getOmBucketInfo().getVolumeName(),
-          getOmBucketInfo().getBucketName());
-      omMetadataManager.getBucketTable().putWithBatch(batchOperation,
-          bucketKey, getOmBucketInfo());
+      OmBucketInfo omBucketInfo = getOmBucketInfo();
+      if (omBucketInfo != null) {
+        String bucketKey = omMetadataManager.getBucketKey(
+                omBucketInfo.getVolumeName(),
+                omBucketInfo.getBucketName());
+        omMetadataManager.getBucketTable().putWithBatch(batchOperation,
+                bucketKey, omBucketInfo);
+      }
 
       if (OMFileRequest.getOmKeyInfoFromFileTable(true,
           omMetadataManager, getMultiPartKey(), getOmKeyInfo().getKeyName())