HDDS-11699. Fix review notices.

apache · Dec 26, 2024 · 487a563 · 487a563
1 parent ce79953
commit 487a563
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 1 deletion.
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneManagerVersion.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneManagerVersion.java
@@ -50,6 +50,9 @@ public enum OzoneManagerVersion implements ComponentVersion {
   S3_OBJECT_TAGGING_API(9, "OzoneManager version that supports S3 object tagging APIs, such as " +
       "PutObjectTagging, GetObjectTagging, and DeleteObjectTagging"),
 
+  S3_PART_AWARE_GET(10, "OzoneManager version that supports S3 get for a specific multipart " +
+                        "upload part number"),
+
   FUTURE_VERSION(-1, "Used internally in the client when the server side is "
       + " newer and an unknown server version has arrived to the client.");
 

diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
@@ -1765,7 +1765,21 @@ public OzoneKeyDetails getS3KeyDetails(String bucketName, String keyName)
   @Override
   public OzoneKeyDetails getS3KeyDetails(String bucketName, String keyName,
                                          int partNumber) throws IOException {
-    OmKeyInfo keyInfo = getS3PartKeyInfo(bucketName, keyName, partNumber);
+    OmKeyInfo keyInfo;
+    if (omVersion.compareTo(OzoneManagerVersion.S3_PART_AWARE_GET) >= 0) {
+      keyInfo = getS3PartKeyInfo(bucketName, keyName, partNumber);
+    } else {
+      keyInfo = getS3KeyInfo(bucketName, keyName, false);
+      List<OmKeyLocationInfo> filteredKeyLocationInfo = keyInfo
+          .getLatestVersionLocations().getBlocksLatestVersionOnly().stream()
+          .filter(omKeyLocationInfo -> omKeyLocationInfo.getPartNumber() ==
+                                       partNumber)
+          .collect(Collectors.toList());
+      keyInfo.updateLocationInfoList(filteredKeyLocationInfo, false);
+      keyInfo.setDataSize(filteredKeyLocationInfo.stream()
+          .mapToLong(OmKeyLocationInfo::getLength)
+          .sum());
+    }
     return getOzoneKeyDetails(keyInfo);
   }
 

diff --git a/hadoop-ozone/dist/src/main/smoketest/s3/objectputget.robot b/hadoop-ozone/dist/src/main/smoketest/s3/objectputget.robot
@@ -270,3 +270,36 @@ Create key twice with different content and expect different ETags
                                 Execute AWSS3Cli           rm s3://${BUCKET}/test_key_to_check_etag_differences
                                 Execute                    rm -rf /tmp/file1
                                 Execute                    rm -rf /tmp/file2
+
+Create&Download big file by multipart upload and get file via part numbers
+                                Execute                            head -c 10000000 </dev/urandom > /tmp/big_file
+    ${result}                   Execute AWSS3CliDebug              cp /tmp/big_file s3://${BUCKET}/
+    ${get_part_1_response}      Execute AWSS3APICli                get-object --bucket ${BUCKET} --key big_file /tmp/big_file_1 --part-number 1
+    ${part_1_size} =            Execute and checkrc                echo '${get_part_1_response}' | jq -r '.ContentLength'  0
+                                Should contain                     ${get_part_1_response}    \"PartsCount\": 2
+    ${get_part_2_response}      Execute AWSS3APICli                get-object --bucket ${BUCKET} --key big_file /tmp/big_file_2 --part-number 2
+    ${part_2_size} =            Execute and checkrc                echo '${get_part_2_response}' | jq -r '.ContentLength'  0
+                                Should contain                     ${get_part_2_response}    \"PartsCount\": 2
+
+                                Should Be Equal As Integers        10000000    ${${part_1_size} + ${part_2_size}}
+
+    ${get_part_3_response}      Execute AWSS3APICli                get-object --bucket ${BUCKET} --key big_file /tmp/big_file_3 --part-number 3
+                                Should contain                     ${get_part_3_response}    \"ContentLength\": 0
+                                Should contain                     ${get_part_3_response}    \"PartsCount\": 2
+                                # clean up
+                                Execute AWSS3Cli                   rm s3://${BUCKET}/big_file
+                                Execute                            rm -rf /tmp/big_file
+                                Execute                            rm -rf /tmp/big_file_1
+                                Execute                            rm -rf /tmp/big_file_2
+                                Execute                            rm -rf /tmp/big_file_3
+
+Create&Download big file by multipart upload and get file not existed part number
+                                Execute                    head -c 10000000 </dev/urandom > /tmp/big_file
+    ${result}                   Execute AWSS3CliDebug      cp /tmp/big_file s3://${BUCKET}/
+    ${get_part_99_response}     Execute AWSS3APICli        get-object --bucket ${BUCKET} --key big_file /tmp/big_file_1 --part-number 99
+                                Should contain             ${get_part_99_response}    \"ContentLength\": 0
+                                Should contain             ${get_part_99_response}    \"PartsCount\": 2
+                                # clean up
+                                Execute AWSS3Cli           rm s3://${BUCKET}/big_file
+                                Execute                    rm -rf /tmp/big_file
+                                Execute                    rm -rf /tmp/big_file_1