ivandika3 commented on code in PR #10605: URL: https://github.com/apache/ozone/pull/10605#discussion_r3475627418
########## hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponse.java: ########## @@ -0,0 +1,246 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.ozone.om.response.s3.multipart; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.io.IOException; +import java.util.List; +import java.util.UUID; +import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; +import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; +import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; +import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PartKeyInfo; +import org.apache.hadoop.util.Time; +import org.junit.jupiter.api.Test; + +/** + * Test multipart upload commit part response. + */ +public class TestS3MultipartUploadCommitPartResponse + extends TestS3MultipartResponse { + + @Test + public void testAddDBToBatch() throws Exception { + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + String multipartUploadID = UUID.randomUUID().toString(); + + OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, + omMetadataManager); + createParentPath(volumeName, bucketName); + + String multipartKey = omMetadataManager + .getMultipartKey(volumeName, bucketName, keyName, multipartUploadID); + long clientId = Time.now(); + String openKey = getPartOpenKey(volumeName, bucketName, keyName, clientId); + + S3MultipartUploadCommitPartResponse s3MultipartUploadCommitPartResponse = + createCommitMPUResponse(volumeName, bucketName, keyName, + multipartUploadID, null, null, + OzoneManagerProtocolProtos.Status.OK, openKey); + + s3MultipartUploadCommitPartResponse.addToDBBatch(omMetadataManager, + batchOperation); + + omMetadataManager.getStore().commitBatchOperation(batchOperation); + + assertNull(omMetadataManager.getOpenKeyTable(getBucketLayout()).get(openKey)); + assertNotNull(omMetadataManager.getMultipartInfoTable().get(multipartKey)); + + // As no parts are created, so no entries should be there in delete table. + assertEquals(0, omMetadataManager.countRowsInTable( + omMetadataManager.getDeletedTable())); + } + + @Test + public void testAddDBToBatchWithParts() throws Exception { + + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + String multipartUploadID = UUID.randomUUID().toString(); + + OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, + omMetadataManager); + createParentPath(volumeName, bucketName); + + String multipartKey = omMetadataManager + .getMultipartKey(volumeName, bucketName, keyName, multipartUploadID); + + S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponse = + createInitiateMPUResponse(volumeName, bucketName, keyName, + multipartUploadID); + + s3InitiateMultipartUploadResponse.addToDBBatch(omMetadataManager, + batchOperation); + + // Add some dummy parts for testing. + // Not added any key locations, as this just test is to see entries are + // adding to delete table or not. + OmMultipartKeyInfo omMultipartKeyInfo = + s3InitiateMultipartUploadResponse.getOmMultipartKeyInfo(); + + PartKeyInfo part1 = createPartKeyInfo(volumeName, bucketName, keyName, 1); + + addPart(1, part1, omMultipartKeyInfo); Review Comment: Nit: Seems this only calls `OmMultipartKeyInfo#addPartKeyInfo`, so technically we can just call it directly. ########## hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponse.java: ########## @@ -0,0 +1,246 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.ozone.om.response.s3.multipart; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.io.IOException; +import java.util.List; +import java.util.UUID; +import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; +import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; +import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; +import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PartKeyInfo; +import org.apache.hadoop.util.Time; +import org.junit.jupiter.api.Test; + +/** + * Test multipart upload commit part response. + */ +public class TestS3MultipartUploadCommitPartResponse + extends TestS3MultipartResponse { + + @Test + public void testAddDBToBatch() throws Exception { + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + String multipartUploadID = UUID.randomUUID().toString(); + + OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, + omMetadataManager); + createParentPath(volumeName, bucketName); + + String multipartKey = omMetadataManager + .getMultipartKey(volumeName, bucketName, keyName, multipartUploadID); + long clientId = Time.now(); + String openKey = getPartOpenKey(volumeName, bucketName, keyName, clientId); + + S3MultipartUploadCommitPartResponse s3MultipartUploadCommitPartResponse = + createCommitMPUResponse(volumeName, bucketName, keyName, + multipartUploadID, null, null, + OzoneManagerProtocolProtos.Status.OK, openKey); + + s3MultipartUploadCommitPartResponse.addToDBBatch(omMetadataManager, + batchOperation); + + omMetadataManager.getStore().commitBatchOperation(batchOperation); + + assertNull(omMetadataManager.getOpenKeyTable(getBucketLayout()).get(openKey)); Review Comment: I did not see the openKeyTable entry being added before this, so this should be null even before running the `addToBatch` ########## hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponse.java: ########## @@ -0,0 +1,384 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.ozone.om.response.s3.multipart; + +import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import org.apache.hadoop.hdds.client.RatisReplicationConfig; +import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; +import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; +import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup; +import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; +import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; +import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; +import org.apache.hadoop.ozone.om.request.util.OMMultipartUploadUtils; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PartKeyInfo; +import org.apache.hadoop.util.Time; +import org.junit.jupiter.api.Test; + +/** + * Test multipart upload complete response. + */ +public class TestS3MultipartUploadCompleteResponse + extends TestS3MultipartResponse { + + @Test + public void testAddDBToBatch() throws Exception { + runAddDBToBatch(true); + } + + @Test + // similar to testAddDBToBatch(), but omBucketInfo is null + public void testAddDBToBatchWithNullBucketInfo() throws Exception { + runAddDBToBatch(false); + } + + private void runAddDBToBatch(boolean withBucketInfo) throws Exception { + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + String multipartUploadID = UUID.randomUUID().toString(); + + OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, + omMetadataManager); + createParentPath(volumeName, bucketName); + + String dbMultipartKey = omMetadataManager.getMultipartKey(volumeName, + bucketName, keyName, multipartUploadID); + String dbMultipartOpenKey = getMultipartOpenKey(volumeName, bucketName, + keyName, multipartUploadID); + + // add MPU entry to open table and multipart info table + S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponse = + createInitiateMPUResponse(volumeName, bucketName, keyName, + multipartUploadID); + s3InitiateMultipartUploadResponse.addToDBBatch(omMetadataManager, + batchOperation); + omMetadataManager.getStore().commitBatchOperation(batchOperation); + + // commit a part without any overwritten part + OmMultipartKeyInfo omMultipartKeyInfo = + s3InitiateMultipartUploadResponse.getOmMultipartKeyInfo(); + addCommittedPart(volumeName, bucketName, keyName, multipartUploadID, + omMultipartKeyInfo); + + OmKeyInfo omKeyInfo = createCompletedKeyInfo(volumeName, bucketName, + keyName, 1000, 50); + + OmBucketInfo omBucketInfo = withBucketInfo ? omMetadataManager + .getBucketTable().get(omMetadataManager + .getBucketKey(volumeName, bucketName)) : null; + + assertNotNull(omMetadataManager.getMultipartInfoTable().get(dbMultipartKey)); + assertNotNull(omMetadataManager.getOpenKeyTable( + getBucketLayout()).get(dbMultipartOpenKey)); + + List<OmKeyInfo> unUsedParts = new ArrayList<>(); + S3MultipartUploadCompleteResponse s3MultipartUploadCompleteResponse = + createCompleteMPUResponse(volumeName, bucketName, keyName, + multipartUploadID, omKeyInfo, + OzoneManagerProtocolProtos.Status.OK, unUsedParts, + omBucketInfo); + + s3MultipartUploadCompleteResponse.addToDBBatch(omMetadataManager, + batchOperation); + + omMetadataManager.getStore().commitBatchOperation(batchOperation); + + assertNotNull(omMetadataManager.getKeyTable(getBucketLayout()) + .get(getFinalDbKey(omKeyInfo))); + assertNull(omMetadataManager.getMultipartInfoTable().get(dbMultipartKey)); + assertNull(omMetadataManager.getOpenKeyTable(getBucketLayout()) + .get(dbMultipartOpenKey)); + + // As no parts are unused, so no entries should be there in delete table. + assertEquals(0, omMetadataManager.countRowsInTable( + omMetadataManager.getDeletedTable())); + } + + @Test + public void testAddDBToBatchWithParts() throws Exception { + + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + + OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, + omMetadataManager); + createParentPath(volumeName, bucketName); + runAddDBToBatchWithParts(volumeName, bucketName, keyName, 0); + + // As 1 unused part exists, so 1 unused entry should be there in delete + // table, in addition to the 1 overwritten part committed earlier. + assertEquals(2, omMetadataManager.countRowsInTable( + omMetadataManager.getDeletedTable())); + } + + @Test + public void testAddDBToBatchWithPartsWithKeyInDeleteTable() throws Exception { + + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + + OmBucketInfo bucketInfo = OMRequestTestUtils.addVolumeAndBucketToDB( + volumeName, bucketName, omMetadataManager); + createParentPath(volumeName, bucketName); + + // Put an entry to delete table with the same key prior to multipart commit + OmKeyInfo prevKey = OMRequestTestUtils.createOmKeyInfo(volumeName, + bucketName, keyName, RatisReplicationConfig.getInstance(ONE), + new OmKeyLocationInfoGroup(0L, new ArrayList<>(), true)) + .setObjectID(8) + .setUpdateID(8) + .build(); + RepeatedOmKeyInfo prevKeys = new RepeatedOmKeyInfo(prevKey, + bucketInfo.getObjectID()); + String ozoneKey = omMetadataManager + .getOzoneKey(prevKey.getVolumeName(), + prevKey.getBucketName(), prevKey.getFileName()); + omMetadataManager.getDeletedTable().put(ozoneKey, prevKeys); Review Comment: Just to be more accurate, let's use `getOzonedeletePathKey` for the prev key as well. ########## hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponse.java: ########## @@ -0,0 +1,384 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.ozone.om.response.s3.multipart; + +import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import org.apache.hadoop.hdds.client.RatisReplicationConfig; +import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; +import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; +import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup; +import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; +import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; +import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; +import org.apache.hadoop.ozone.om.request.util.OMMultipartUploadUtils; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PartKeyInfo; +import org.apache.hadoop.util.Time; +import org.junit.jupiter.api.Test; + +/** + * Test multipart upload complete response. + */ +public class TestS3MultipartUploadCompleteResponse + extends TestS3MultipartResponse { + + @Test + public void testAddDBToBatch() throws Exception { + runAddDBToBatch(true); + } + + @Test + // similar to testAddDBToBatch(), but omBucketInfo is null + public void testAddDBToBatchWithNullBucketInfo() throws Exception { + runAddDBToBatch(false); + } + + private void runAddDBToBatch(boolean withBucketInfo) throws Exception { + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + String multipartUploadID = UUID.randomUUID().toString(); + + OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, + omMetadataManager); + createParentPath(volumeName, bucketName); + + String dbMultipartKey = omMetadataManager.getMultipartKey(volumeName, + bucketName, keyName, multipartUploadID); + String dbMultipartOpenKey = getMultipartOpenKey(volumeName, bucketName, + keyName, multipartUploadID); + + // add MPU entry to open table and multipart info table + S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponse = + createInitiateMPUResponse(volumeName, bucketName, keyName, + multipartUploadID); + s3InitiateMultipartUploadResponse.addToDBBatch(omMetadataManager, + batchOperation); + omMetadataManager.getStore().commitBatchOperation(batchOperation); + + // commit a part without any overwritten part + OmMultipartKeyInfo omMultipartKeyInfo = + s3InitiateMultipartUploadResponse.getOmMultipartKeyInfo(); + addCommittedPart(volumeName, bucketName, keyName, multipartUploadID, + omMultipartKeyInfo); + + OmKeyInfo omKeyInfo = createCompletedKeyInfo(volumeName, bucketName, + keyName, 1000, 50); + + OmBucketInfo omBucketInfo = withBucketInfo ? omMetadataManager + .getBucketTable().get(omMetadataManager + .getBucketKey(volumeName, bucketName)) : null; + + assertNotNull(omMetadataManager.getMultipartInfoTable().get(dbMultipartKey)); + assertNotNull(omMetadataManager.getOpenKeyTable( + getBucketLayout()).get(dbMultipartOpenKey)); + + List<OmKeyInfo> unUsedParts = new ArrayList<>(); + S3MultipartUploadCompleteResponse s3MultipartUploadCompleteResponse = + createCompleteMPUResponse(volumeName, bucketName, keyName, + multipartUploadID, omKeyInfo, + OzoneManagerProtocolProtos.Status.OK, unUsedParts, + omBucketInfo); + + s3MultipartUploadCompleteResponse.addToDBBatch(omMetadataManager, + batchOperation); + + omMetadataManager.getStore().commitBatchOperation(batchOperation); + + assertNotNull(omMetadataManager.getKeyTable(getBucketLayout()) + .get(getFinalDbKey(omKeyInfo))); + assertNull(omMetadataManager.getMultipartInfoTable().get(dbMultipartKey)); + assertNull(omMetadataManager.getOpenKeyTable(getBucketLayout()) + .get(dbMultipartOpenKey)); + + // As no parts are unused, so no entries should be there in delete table. + assertEquals(0, omMetadataManager.countRowsInTable( + omMetadataManager.getDeletedTable())); + } + + @Test + public void testAddDBToBatchWithParts() throws Exception { + + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + + OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, + omMetadataManager); + createParentPath(volumeName, bucketName); + runAddDBToBatchWithParts(volumeName, bucketName, keyName, 0); + + // As 1 unused part exists, so 1 unused entry should be there in delete + // table, in addition to the 1 overwritten part committed earlier. + assertEquals(2, omMetadataManager.countRowsInTable( + omMetadataManager.getDeletedTable())); + } + + @Test + public void testAddDBToBatchWithPartsWithKeyInDeleteTable() throws Exception { + + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + + OmBucketInfo bucketInfo = OMRequestTestUtils.addVolumeAndBucketToDB( + volumeName, bucketName, omMetadataManager); + createParentPath(volumeName, bucketName); + + // Put an entry to delete table with the same key prior to multipart commit + OmKeyInfo prevKey = OMRequestTestUtils.createOmKeyInfo(volumeName, + bucketName, keyName, RatisReplicationConfig.getInstance(ONE), + new OmKeyLocationInfoGroup(0L, new ArrayList<>(), true)) + .setObjectID(8) + .setUpdateID(8) + .build(); + RepeatedOmKeyInfo prevKeys = new RepeatedOmKeyInfo(prevKey, + bucketInfo.getObjectID()); + String ozoneKey = omMetadataManager + .getOzoneKey(prevKey.getVolumeName(), + prevKey.getBucketName(), prevKey.getFileName()); + omMetadataManager.getDeletedTable().put(ozoneKey, prevKeys); + + long oId = runAddDBToBatchWithParts(volumeName, bucketName, keyName, 1); + + // Make sure new object isn't in delete table + RepeatedOmKeyInfo ds = omMetadataManager.getDeletedTable().get(ozoneKey); + for (OmKeyInfo omKeyInfo : ds.getOmKeyInfoList()) { + assertNotEquals(oId, omKeyInfo.getObjectID()); + } + + // As 1 unused part, 1 overwritten part and 1 previously put-and-deleted + // object exist, so 3 entries should be there in delete table. + assertEquals(3, omMetadataManager.countRowsInTable( + omMetadataManager.getDeletedTable())); + } + + private long runAddDBToBatchWithParts(String volumeName, + String bucketName, String keyName, int deleteEntryCount) + throws Exception { + + String multipartUploadID = UUID.randomUUID().toString(); + + String dbMultipartKey = omMetadataManager.getMultipartKey(volumeName, + bucketName, keyName, multipartUploadID); + String dbMultipartOpenKey = getMultipartOpenKey(volumeName, bucketName, + keyName, multipartUploadID); + + S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponse = + createInitiateMPUResponse(volumeName, bucketName, keyName, + multipartUploadID); + s3InitiateMultipartUploadResponse.addToDBBatch(omMetadataManager, + batchOperation); + + OmMultipartKeyInfo omMultipartKeyInfo = + s3InitiateMultipartUploadResponse.getOmMultipartKeyInfo(); + + // After commit, it adds an entry to the deleted table. Incrementing the + // variable before the method call, because this method also has entry + // count check inside. + deleteEntryCount++; + OmKeyInfo committedPartKeyInfo = commitOnePart(volumeName, bucketName, + keyName, multipartUploadID, dbMultipartKey, omMultipartKeyInfo, + deleteEntryCount); Review Comment: Nit: Pass `deleteEntryCount + 1` directly? ########## hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponse.java: ########## @@ -0,0 +1,246 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.ozone.om.response.s3.multipart; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.io.IOException; +import java.util.List; +import java.util.UUID; +import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; +import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; +import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; +import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PartKeyInfo; +import org.apache.hadoop.util.Time; +import org.junit.jupiter.api.Test; + +/** + * Test multipart upload commit part response. + */ +public class TestS3MultipartUploadCommitPartResponse + extends TestS3MultipartResponse { + + @Test + public void testAddDBToBatch() throws Exception { + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + String multipartUploadID = UUID.randomUUID().toString(); + + OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, + omMetadataManager); + createParentPath(volumeName, bucketName); + + String multipartKey = omMetadataManager + .getMultipartKey(volumeName, bucketName, keyName, multipartUploadID); + long clientId = Time.now(); + String openKey = getPartOpenKey(volumeName, bucketName, keyName, clientId); + + S3MultipartUploadCommitPartResponse s3MultipartUploadCommitPartResponse = + createCommitMPUResponse(volumeName, bucketName, keyName, + multipartUploadID, null, null, + OzoneManagerProtocolProtos.Status.OK, openKey); + + s3MultipartUploadCommitPartResponse.addToDBBatch(omMetadataManager, + batchOperation); + + omMetadataManager.getStore().commitBatchOperation(batchOperation); + + assertNull(omMetadataManager.getOpenKeyTable(getBucketLayout()).get(openKey)); + assertNotNull(omMetadataManager.getMultipartInfoTable().get(multipartKey)); + + // As no parts are created, so no entries should be there in delete table. + assertEquals(0, omMetadataManager.countRowsInTable( + omMetadataManager.getDeletedTable())); + } + + @Test + public void testAddDBToBatchWithParts() throws Exception { + + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + String multipartUploadID = UUID.randomUUID().toString(); + + OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, + omMetadataManager); + createParentPath(volumeName, bucketName); + + String multipartKey = omMetadataManager + .getMultipartKey(volumeName, bucketName, keyName, multipartUploadID); + + S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponse = + createInitiateMPUResponse(volumeName, bucketName, keyName, + multipartUploadID); + + s3InitiateMultipartUploadResponse.addToDBBatch(omMetadataManager, + batchOperation); + + // Add some dummy parts for testing. + // Not added any key locations, as this just test is to see entries are + // adding to delete table or not. + OmMultipartKeyInfo omMultipartKeyInfo = + s3InitiateMultipartUploadResponse.getOmMultipartKeyInfo(); + + PartKeyInfo part1 = createPartKeyInfo(volumeName, bucketName, keyName, 1); + + addPart(1, part1, omMultipartKeyInfo); + + long clientId = Time.now(); + String openKey = getPartOpenKey(volumeName, bucketName, keyName, clientId); + + S3MultipartUploadCommitPartResponse s3MultipartUploadCommitPartResponse = + createCommitMPUResponse(volumeName, bucketName, keyName, + multipartUploadID, omMultipartKeyInfo.getPartKeyInfo(1), + omMultipartKeyInfo, + OzoneManagerProtocolProtos.Status.OK, openKey); + + s3MultipartUploadCommitPartResponse.checkAndUpdateDB(omMetadataManager, + batchOperation); + + omMetadataManager.getStore().commitBatchOperation(batchOperation); + + // The open key is removed from the open key table, while the committed + // part is persisted to the multipart info table. + assertNull( + omMetadataManager.getOpenKeyTable(getBucketLayout()).get(openKey)); Review Comment: Similarly here, I don't see the open key table creation for the commit part. The initiate MPU also creates a open key entry, but it's has different key format. We can also check that the open key in initiate MPU will not be removed. Please check the other tests as well for similar issues. ########## hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponse.java: ########## @@ -0,0 +1,384 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.ozone.om.response.s3.multipart; + +import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import org.apache.hadoop.hdds.client.RatisReplicationConfig; +import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; +import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; +import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup; +import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; +import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; +import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; +import org.apache.hadoop.ozone.om.request.util.OMMultipartUploadUtils; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PartKeyInfo; +import org.apache.hadoop.util.Time; +import org.junit.jupiter.api.Test; + +/** + * Test multipart upload complete response. + */ +public class TestS3MultipartUploadCompleteResponse + extends TestS3MultipartResponse { + + @Test + public void testAddDBToBatch() throws Exception { + runAddDBToBatch(true); + } + + @Test + // similar to testAddDBToBatch(), but omBucketInfo is null + public void testAddDBToBatchWithNullBucketInfo() throws Exception { + runAddDBToBatch(false); + } + + private void runAddDBToBatch(boolean withBucketInfo) throws Exception { + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + String multipartUploadID = UUID.randomUUID().toString(); + + OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, + omMetadataManager); + createParentPath(volumeName, bucketName); + + String dbMultipartKey = omMetadataManager.getMultipartKey(volumeName, + bucketName, keyName, multipartUploadID); + String dbMultipartOpenKey = getMultipartOpenKey(volumeName, bucketName, + keyName, multipartUploadID); + + // add MPU entry to open table and multipart info table + S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponse = + createInitiateMPUResponse(volumeName, bucketName, keyName, + multipartUploadID); + s3InitiateMultipartUploadResponse.addToDBBatch(omMetadataManager, + batchOperation); + omMetadataManager.getStore().commitBatchOperation(batchOperation); + + // commit a part without any overwritten part + OmMultipartKeyInfo omMultipartKeyInfo = + s3InitiateMultipartUploadResponse.getOmMultipartKeyInfo(); + addCommittedPart(volumeName, bucketName, keyName, multipartUploadID, + omMultipartKeyInfo); + + OmKeyInfo omKeyInfo = createCompletedKeyInfo(volumeName, bucketName, + keyName, 1000, 50); + + OmBucketInfo omBucketInfo = withBucketInfo ? omMetadataManager + .getBucketTable().get(omMetadataManager + .getBucketKey(volumeName, bucketName)) : null; + + assertNotNull(omMetadataManager.getMultipartInfoTable().get(dbMultipartKey)); + assertNotNull(omMetadataManager.getOpenKeyTable( + getBucketLayout()).get(dbMultipartOpenKey)); + + List<OmKeyInfo> unUsedParts = new ArrayList<>(); + S3MultipartUploadCompleteResponse s3MultipartUploadCompleteResponse = + createCompleteMPUResponse(volumeName, bucketName, keyName, + multipartUploadID, omKeyInfo, + OzoneManagerProtocolProtos.Status.OK, unUsedParts, + omBucketInfo); + + s3MultipartUploadCompleteResponse.addToDBBatch(omMetadataManager, + batchOperation); + + omMetadataManager.getStore().commitBatchOperation(batchOperation); + + assertNotNull(omMetadataManager.getKeyTable(getBucketLayout()) + .get(getFinalDbKey(omKeyInfo))); + assertNull(omMetadataManager.getMultipartInfoTable().get(dbMultipartKey)); + assertNull(omMetadataManager.getOpenKeyTable(getBucketLayout()) + .get(dbMultipartOpenKey)); + + // As no parts are unused, so no entries should be there in delete table. + assertEquals(0, omMetadataManager.countRowsInTable( + omMetadataManager.getDeletedTable())); + } + + @Test + public void testAddDBToBatchWithParts() throws Exception { + + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + + OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, + omMetadataManager); + createParentPath(volumeName, bucketName); + runAddDBToBatchWithParts(volumeName, bucketName, keyName, 0); + + // As 1 unused part exists, so 1 unused entry should be there in delete + // table, in addition to the 1 overwritten part committed earlier. + assertEquals(2, omMetadataManager.countRowsInTable( + omMetadataManager.getDeletedTable())); + } + + @Test + public void testAddDBToBatchWithPartsWithKeyInDeleteTable() throws Exception { + + String volumeName = UUID.randomUUID().toString(); + String bucketName = UUID.randomUUID().toString(); + String keyName = getKeyName(); + + OmBucketInfo bucketInfo = OMRequestTestUtils.addVolumeAndBucketToDB( + volumeName, bucketName, omMetadataManager); + createParentPath(volumeName, bucketName); + + // Put an entry to delete table with the same key prior to multipart commit + OmKeyInfo prevKey = OMRequestTestUtils.createOmKeyInfo(volumeName, + bucketName, keyName, RatisReplicationConfig.getInstance(ONE), + new OmKeyLocationInfoGroup(0L, new ArrayList<>(), true)) + .setObjectID(8) + .setUpdateID(8) + .build(); + RepeatedOmKeyInfo prevKeys = new RepeatedOmKeyInfo(prevKey, + bucketInfo.getObjectID()); + String ozoneKey = omMetadataManager + .getOzoneKey(prevKey.getVolumeName(), + prevKey.getBucketName(), prevKey.getFileName()); + omMetadataManager.getDeletedTable().put(ozoneKey, prevKeys); + + long oId = runAddDBToBatchWithParts(volumeName, bucketName, keyName, 1); + + // Make sure new object isn't in delete table + RepeatedOmKeyInfo ds = omMetadataManager.getDeletedTable().get(ozoneKey); + for (OmKeyInfo omKeyInfo : ds.getOmKeyInfoList()) { + assertNotEquals(oId, omKeyInfo.getObjectID()); + } + + // As 1 unused part, 1 overwritten part and 1 previously put-and-deleted + // object exist, so 3 entries should be there in delete table. + assertEquals(3, omMetadataManager.countRowsInTable( + omMetadataManager.getDeletedTable())); + } + + private long runAddDBToBatchWithParts(String volumeName, + String bucketName, String keyName, int deleteEntryCount) Review Comment: Nit: `deleteEntryCount` -> `expectedDeleteEntryCount`. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
