diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java index bca954403f11..9989aaf57539 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java @@ -17,8 +17,11 @@ package org.apache.hadoop.ozone.om; +import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.S3_SECRET_TABLE; + import java.io.IOException; import java.util.List; +import org.apache.hadoop.hdds.utils.db.cache.TableCacheUpdateTracker; import org.apache.hadoop.ozone.om.helpers.S3SecretValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -102,6 +105,7 @@ default void updateCache(String accessId, S3SecretValue secret) { if (cache != null) { LOG.info("Updating cache for accessId/user: {}.", accessId); cache.put(accessId, secret); + TableCacheUpdateTracker.recordCacheUpdate(S3_SECRET_TABLE); } } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java index 5de26d73ad43..a7c42ba447cf 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java @@ -22,7 +22,6 @@ import com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; @@ -45,7 +44,6 @@ import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.S3SecretManager; import org.apache.hadoop.ozone.om.codec.OMDBDefinition; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -529,17 +527,7 @@ private static boolean isStandaloneBatchCmdTypes(OMResponse response) { private void addCleanupEntry(Entry entry, Map> cleanupEpochs) { OMClientResponse response = entry.getResponse(); - CleanupTableInfo cleanupTableInfo = - response.getClass().getAnnotation(CleanupTableInfo.class); - final Iterable cleanupTables; - if (cleanupTableInfo == null) { - cleanupTables = response.removeCleanupTables(); - } else if (cleanupTableInfo.cleanupAll()) { - cleanupTables = OMDBDefinition.get().getColumnFamilyNames(); - } else { - cleanupTables = Arrays.asList(cleanupTableInfo.cleanupTables()); - } - for (String table : cleanupTables) { + for (String table : response.removeCleanupTables()) { cleanupEpochs.computeIfAbsent(table, list -> new ArrayList<>()) .add(entry.getTermIndex().getIndex()); } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java index 77974fbf3541..2159baa5e757 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java @@ -164,18 +164,18 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut result = OMDirectoryCreateRequest.Result.SUCCESS; omClientResponse = new OMDirectoryCreateResponseWithFSO(omResponse.build(), - volumeId, bucketId, dirInfo, missingParentInfos, result, + volumeId, bucketId, dirInfo, missingParentInfos, getBucketLayout(), omBucketInfo.copyObject()); } else { result = Result.DIRECTORY_ALREADY_EXISTS; omResponse.setStatus(Status.DIRECTORY_ALREADY_EXISTS); omClientResponse = - new OMDirectoryCreateResponseWithFSO(omResponse.build(), result); + new OMDirectoryCreateResponseWithFSO(omResponse.build()); } } catch (IOException | InvalidPathException ex) { exception = ex; omClientResponse = new OMDirectoryCreateResponseWithFSO( - createErrorOMResponse(omResponse, exception), result); + createErrorOMResponse(omResponse, exception)); } finally { if (acquiredLock) { mergeOmLockDetails(omMetadataManager.getLock() diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/CleanupTableInfo.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/CleanupTableInfo.java deleted file mode 100644 index c8f4a7a58ea9..000000000000 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/CleanupTableInfo.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import org.apache.hadoop.hdds.annotation.InterfaceStability; - -/** - * Annotation to provide information about clean up table information for - * {@link OMClientResponse}. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -@Inherited -@InterfaceStability.Evolving -public @interface CleanupTableInfo { - - /** - * Array of tables affected by this operation. This information will be used - * during cleanup table cache. - * @return list of table names. - */ - String[] cleanupTables() default {}; - - /** - * If all tables are affected, like at update finalization, one can specify - * cleanupAll=true, instead of the list of all tables. In this case the - * cleanupTable property has to be defined as an empty array (the default). - * @return whether to cleanup all tables. - */ - boolean cleanupAll() default false; -} diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/DummyOMClientResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/DummyOMClientResponse.java index a53c3adfc45f..5bf2d48f09ad 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/DummyOMClientResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/DummyOMClientResponse.java @@ -26,7 +26,6 @@ /** * A dummy OMClientResponse implementation. */ -@CleanupTableInfo public class DummyOMClientResponse extends OMClientResponse { public DummyOMClientResponse(@Nonnull OMResponse omResponse) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketCreateResponse.java index 2bb5034d0706..d3bcbffc205b 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketCreateResponse.java @@ -17,9 +17,6 @@ package org.apache.hadoop.ozone.om.response.bucket; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.VOLUME_TABLE; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.io.IOException; @@ -27,14 +24,12 @@ import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for CreateBucket request. */ -@CleanupTableInfo(cleanupTables = {BUCKET_TABLE, VOLUME_TABLE}) public final class OMBucketCreateResponse extends OMClientResponse { private final OmBucketInfo omBucketInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketDeleteResponse.java index aa7316cc8c42..da0e75059883 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketDeleteResponse.java @@ -17,23 +17,17 @@ package org.apache.hadoop.ozone.om.response.bucket; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.LIFECYCLE_CONFIGURATION_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.VOLUME_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for DeleteBucket request. */ -@CleanupTableInfo(cleanupTables = {BUCKET_TABLE, VOLUME_TABLE, LIFECYCLE_CONFIGURATION_TABLE}) public final class OMBucketDeleteResponse extends OMClientResponse { private String volumeName; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketSetOwnerResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketSetOwnerResponse.java index 74c2a8bbb29f..3ca03d873040 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketSetOwnerResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketSetOwnerResponse.java @@ -17,14 +17,11 @@ package org.apache.hadoop.ozone.om.response.bucket; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -32,7 +29,6 @@ /** * Response for set owner request. */ -@CleanupTableInfo(cleanupTables = {BUCKET_TABLE}) public class OMBucketSetOwnerResponse extends OMClientResponse { private OmBucketInfo omBucketInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketSetPropertyResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketSetPropertyResponse.java index 141ceb1c7465..52a9678e4933 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketSetPropertyResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketSetPropertyResponse.java @@ -17,21 +17,17 @@ package org.apache.hadoop.ozone.om.response.bucket; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for SetBucketProperty request. */ -@CleanupTableInfo(cleanupTables = {BUCKET_TABLE}) public class OMBucketSetPropertyResponse extends OMClientResponse { private OmBucketInfo omBucketInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/acl/OMBucketAclResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/acl/OMBucketAclResponse.java index ce6a435a137e..b18ef1003656 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/acl/OMBucketAclResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/acl/OMBucketAclResponse.java @@ -17,21 +17,17 @@ package org.apache.hadoop.ozone.om.response.bucket.acl; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for Bucket acl request. */ -@CleanupTableInfo(cleanupTables = {BUCKET_TABLE}) public class OMBucketAclResponse extends OMClientResponse { private final OmBucketInfo omBucketInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponse.java index f6e3a9d5de2f..b2547c1db215 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponse.java @@ -17,8 +17,6 @@ package org.apache.hadoop.ozone.om.response.file; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.List; @@ -28,7 +26,6 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequest.Result; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.key.OmKeyResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; import org.slf4j.Logger; @@ -37,7 +34,6 @@ /** * Response for create directory request. */ -@CleanupTableInfo(cleanupTables = {KEY_TABLE}) public class OMDirectoryCreateResponse extends OmKeyResponse { private static final Logger LOG = diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseWithFSO.java index c6015f3891de..b5e047d89cfc 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseWithFSO.java @@ -17,8 +17,6 @@ package org.apache.hadoop.ozone.om.response.file; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DIRECTORY_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.List; @@ -27,8 +25,6 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo; -import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequest.Result; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.key.OmKeyResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; import org.slf4j.Logger; @@ -37,7 +33,6 @@ /** * Response for create directory request. */ -@CleanupTableInfo(cleanupTables = {DIRECTORY_TABLE}) public class OMDirectoryCreateResponseWithFSO extends OmKeyResponse { private static final Logger LOG = @@ -45,21 +40,18 @@ public class OMDirectoryCreateResponseWithFSO extends OmKeyResponse { private OmDirectoryInfo dirInfo; private List parentDirInfos; - private Result result; private long volumeId; private long bucketId; private OmBucketInfo bucketInfo; - @SuppressWarnings("checkstyle:ParameterNumber") public OMDirectoryCreateResponseWithFSO(@Nonnull OMResponse omResponse, @Nonnull long volumeId, @Nonnull long bucketId, @Nonnull OmDirectoryInfo dirInfo, - @Nonnull List pDirInfos, @Nonnull Result result, + @Nonnull List pDirInfos, @Nonnull BucketLayout bucketLayout, @Nonnull OmBucketInfo bucketInfo) { super(omResponse, bucketLayout); this.dirInfo = dirInfo; this.parentDirInfos = pDirInfos; - this.result = result; this.volumeId = volumeId; this.bucketId = bucketId; this.bucketInfo = bucketInfo; @@ -68,10 +60,8 @@ public OMDirectoryCreateResponseWithFSO(@Nonnull OMResponse omResponse, /** * For when the request is not successful or the directory already exists. */ - public OMDirectoryCreateResponseWithFSO(@Nonnull OMResponse omResponse, - @Nonnull Result result) { + public OMDirectoryCreateResponseWithFSO(@Nonnull OMResponse omResponse) { super(omResponse); - this.result = result; } @Override diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponse.java index 428e90075b36..3d5223055fa7 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponse.java @@ -17,22 +17,17 @@ package org.apache.hadoop.ozone.om.response.file; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_KEY_TABLE; - import jakarta.annotation.Nonnull; import java.util.List; import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.key.OMKeyCreateResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for crate file request. */ -@CleanupTableInfo(cleanupTables = {KEY_TABLE, OPEN_KEY_TABLE}) public class OMFileCreateResponse extends OMKeyCreateResponse { public OMFileCreateResponse(@Nonnull OMResponse omResponse, diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseWithFSO.java index 02c72110ad4d..e0dcbc37d4d9 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseWithFSO.java @@ -17,10 +17,6 @@ package org.apache.hadoop.ozone.om.response.file; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DIRECTORY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_FILE_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.ArrayList; @@ -32,14 +28,11 @@ import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.request.file.OMFileRequest; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for create file request - prefix layout. */ -@CleanupTableInfo(cleanupTables = {DIRECTORY_TABLE, OPEN_FILE_TABLE, - BUCKET_TABLE}) public class OMFileCreateResponseWithFSO extends OMFileCreateResponse { private List parentDirInfos; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMRecoverLeaseResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMRecoverLeaseResponse.java index 4d66697d6918..20316f7473de 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMRecoverLeaseResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMRecoverLeaseResponse.java @@ -17,23 +17,18 @@ package org.apache.hadoop.ozone.om.response.file; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.FILE_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_FILE_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.key.OmKeyResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Performs tasks for RecoverLease request responses. */ -@CleanupTableInfo(cleanupTables = {FILE_TABLE, OPEN_FILE_TABLE}) public class OMRecoverLeaseResponse extends OmKeyResponse { private OmKeyInfo openKeyInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponse.java index eb8d7bd50591..e3ffe7334e9d 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponse.java @@ -17,22 +17,17 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_KEY_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for AllocateBlock request. */ -@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, BUCKET_TABLE}) public class OMAllocateBlockResponse extends OmKeyResponse { private OmKeyInfo omKeyInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseWithFSO.java index 2d174a172c61..3b8d30691ee0 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseWithFSO.java @@ -17,9 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_FILE_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; @@ -27,13 +24,11 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.request.file.OMFileRequest; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for AllocateBlock request - prefix layout. */ -@CleanupTableInfo(cleanupTables = {OPEN_FILE_TABLE, BUCKET_TABLE}) public class OMAllocateBlockResponseWithFSO extends OMAllocateBlockResponse { private long volumeId; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMDirectoriesPurgeResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMDirectoriesPurgeResponseWithFSO.java index 127ec4ed2cbf..57e69cb3ea57 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMDirectoriesPurgeResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMDirectoriesPurgeResponseWithFSO.java @@ -17,11 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_DIR_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DIRECTORY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.FILE_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_INFO_TABLE; import static org.apache.hadoop.ozone.om.lock.DAGLeveledResource.SNAPSHOT_DB_CONTENT_LOCK; import com.google.common.annotations.VisibleForTesting; @@ -47,7 +42,6 @@ import org.apache.hadoop.ozone.om.lock.IOzoneManagerLock; import org.apache.hadoop.ozone.om.lock.OMLockDetails; import org.apache.hadoop.ozone.om.request.key.OMDirectoriesPurgeRequestWithFSO; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; import org.apache.ratis.util.function.UncheckedAutoCloseableSupplier; @@ -57,8 +51,6 @@ /** * Response for {@link OMDirectoriesPurgeRequestWithFSO} request. */ -@CleanupTableInfo(cleanupTables = {DELETED_TABLE, DELETED_DIR_TABLE, - DIRECTORY_TABLE, FILE_TABLE, SNAPSHOT_INFO_TABLE}) public class OMDirectoriesPurgeResponseWithFSO extends OmKeyResponse { private static final Logger LOG = LoggerFactory.getLogger(OMDirectoriesPurgeResponseWithFSO.class); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponse.java index 425c4f63ac5e..f40c81d5ea0a 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponse.java @@ -17,11 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_KEY_TABLE; - import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Nonnull; import java.io.IOException; @@ -32,14 +27,11 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for CommitKey request. */ -@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, KEY_TABLE, DELETED_TABLE, - BUCKET_TABLE}) public class OMKeyCommitResponse extends OmKeyResponse { private OmKeyInfo omKeyInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseWithFSO.java index b210a8ce5d49..585ede59e32f 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseWithFSO.java @@ -17,11 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.FILE_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_FILE_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.Map; @@ -32,14 +27,11 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; import org.apache.hadoop.ozone.om.request.file.OMFileRequest; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for CommitKey request - prefix layout1. */ -@CleanupTableInfo(cleanupTables = {OPEN_FILE_TABLE, FILE_TABLE, DELETED_TABLE, - BUCKET_TABLE}) public class OMKeyCommitResponseWithFSO extends OMKeyCommitResponse { private long volumeId; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponse.java index 1bd03c4187be..0f20fc5f586e 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponse.java @@ -17,10 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_KEY_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.List; @@ -29,7 +25,6 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +32,6 @@ /** * Response for CreateKey request. */ -@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, KEY_TABLE, BUCKET_TABLE}) public class OMKeyCreateResponse extends OmKeyResponse { protected static final Logger LOG = diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseWithFSO.java index a72ad370b940..19f33e3d4090 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseWithFSO.java @@ -17,25 +17,18 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DIRECTORY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_FILE_TABLE; - import jakarta.annotation.Nonnull; import java.util.List; import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.file.OMFileCreateResponseWithFSO; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for CreateKey request - prefix layout. */ -@CleanupTableInfo(cleanupTables = {DIRECTORY_TABLE, OPEN_FILE_TABLE, - BUCKET_TABLE}) public class OMKeyCreateResponseWithFSO extends OMFileCreateResponseWithFSO { public OMKeyCreateResponseWithFSO(@Nonnull OMResponse omResponse, diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java index be646c4ee289..b8ffc1aaf783 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java @@ -17,11 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_KEY_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; @@ -31,13 +26,11 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for DeleteKey request. */ -@CleanupTableInfo(cleanupTables = {KEY_TABLE, OPEN_KEY_TABLE, DELETED_TABLE, BUCKET_TABLE}) public class OMKeyDeleteResponse extends AbstractOMKeyDeleteResponse { private OmKeyInfo omKeyInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java index 1b84bf51cb83..bfae0b6a687d 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java @@ -17,13 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_DIR_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DIRECTORY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.FILE_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_FILE_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; @@ -33,14 +26,11 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for DeleteKey request. */ -@CleanupTableInfo(cleanupTables = {FILE_TABLE, OPEN_FILE_TABLE, DIRECTORY_TABLE, - DELETED_TABLE, DELETED_DIR_TABLE, BUCKET_TABLE}) public class OMKeyDeleteResponseWithFSO extends OMKeyDeleteResponse { private boolean isDeleteDirectory; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyPurgeResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyPurgeResponse.java index 608f58cf7555..23e39770a164 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyPurgeResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyPurgeResponse.java @@ -17,8 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_INFO_TABLE; import static org.apache.hadoop.ozone.om.lock.DAGLeveledResource.SNAPSHOT_DB_CONTENT_LOCK; import static org.apache.hadoop.ozone.om.response.snapshot.OMSnapshotMoveDeletedKeysResponse.createRepeatedOmKeyInfo; @@ -40,7 +38,6 @@ import org.apache.hadoop.ozone.om.lock.IOzoneManagerLock; import org.apache.hadoop.ozone.om.lock.OMLockDetails; import org.apache.hadoop.ozone.om.request.key.OMKeyPurgeRequest; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotMoveKeyInfos; @@ -49,7 +46,6 @@ /** * Response for {@link OMKeyPurgeRequest} request. */ -@CleanupTableInfo(cleanupTables = {DELETED_TABLE, SNAPSHOT_INFO_TABLE}) public class OMKeyPurgeResponse extends OmKeyResponse { private List bucketInfosToBeUpdated; private List purgeKeyList; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponse.java index 894a80328752..16c51afcad72 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponse.java @@ -17,9 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_RENAMED_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; @@ -27,13 +24,11 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.request.OMClientRequestUtils; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for RenameKey request. */ -@CleanupTableInfo(cleanupTables = {KEY_TABLE, SNAPSHOT_RENAMED_TABLE}) public class OMKeyRenameResponse extends OmKeyResponse { private String fromKeyName; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseWithFSO.java index e9f2a32776e5..ed86afd0226f 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseWithFSO.java @@ -17,10 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DIRECTORY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.FILE_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_RENAMED_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; @@ -31,14 +27,11 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.request.OMClientRequestUtils; import org.apache.hadoop.ozone.om.request.file.OMFileRequest; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for RenameKey request - prefix layout. */ -@CleanupTableInfo(cleanupTables = {FILE_TABLE, DIRECTORY_TABLE, - SNAPSHOT_RENAMED_TABLE}) public class OMKeyRenameResponseWithFSO extends OMKeyRenameResponse { private boolean isRenameDirectory; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeySetTimesResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeySetTimesResponse.java index 0dea40ef2aad..9b7cb66435d7 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeySetTimesResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeySetTimesResponse.java @@ -17,21 +17,17 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for Bucket acl request. */ -@CleanupTableInfo(cleanupTables = KEY_TABLE) public class OMKeySetTimesResponse extends OmKeyResponse { private OmKeyInfo omKeyInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeySetTimesResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeySetTimesResponseWithFSO.java index 2fa41cc22419..921dcc394df8 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeySetTimesResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeySetTimesResponseWithFSO.java @@ -17,9 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DIRECTORY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.FILE_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; @@ -28,13 +25,11 @@ import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.request.file.OMFileRequest; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; /** * Response for Bucket acl request for prefix layout. */ -@CleanupTableInfo(cleanupTables = { FILE_TABLE, DIRECTORY_TABLE }) public class OMKeySetTimesResponseWithFSO extends OMKeySetTimesResponse { private boolean isDirectory; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java index fd089005fcd8..ff675034a3c4 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java @@ -17,11 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.LIFECYCLE_SCAN_STATE_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_KEY_TABLE; import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.OK; import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.PARTIAL_DELETE; @@ -37,13 +32,11 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmLifecycleScanState; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for DeleteKey request. */ -@CleanupTableInfo(cleanupTables = {KEY_TABLE, OPEN_KEY_TABLE, DELETED_TABLE, BUCKET_TABLE, LIFECYCLE_SCAN_STATE_TABLE}) public class OMKeysDeleteResponse extends AbstractOMKeyDeleteResponse { private List omKeyInfoList; private OmBucketInfo omBucketInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponseWithFSO.java index 7bdcfa00b5b6..af3f6240d321 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponseWithFSO.java @@ -17,14 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_DIR_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DIRECTORY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.FILE_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.LIFECYCLE_SCAN_STATE_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_FILE_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.List; @@ -36,14 +28,11 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmLifecycleScanState; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; /** * Response for DeleteKeys request. */ -@CleanupTableInfo(cleanupTables = { FILE_TABLE, OPEN_FILE_TABLE, DIRECTORY_TABLE, - DELETED_DIR_TABLE, DELETED_TABLE, BUCKET_TABLE, LIFECYCLE_SCAN_STATE_TABLE}) public class OMKeysDeleteResponseWithFSO extends OMKeysDeleteResponse { private List dirsList; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysRenameResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysRenameResponse.java index 270e1788e853..ddc7971f5ced 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysRenameResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysRenameResponse.java @@ -17,8 +17,6 @@ package org.apache.hadoop.ozone.om.response.key; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_RENAMED_TABLE; import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.OK; import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.PARTIAL_RENAME; @@ -30,14 +28,12 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmRenameKeys; import org.apache.hadoop.ozone.om.request.OMClientRequestUtils; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for RenameKeys request. */ -@CleanupTableInfo(cleanupTables = {KEY_TABLE, SNAPSHOT_RENAMED_TABLE}) public class OMKeysRenameResponse extends OMClientResponse { private OmRenameKeys omRenameKeys; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponse.java index 35da09822ec4..d1c6d05bfec9 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponse.java @@ -17,22 +17,18 @@ package org.apache.hadoop.ozone.om.response.key.acl; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.key.OmKeyResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for Bucket acl request. */ -@CleanupTableInfo(cleanupTables = KEY_TABLE) public class OMKeyAclResponse extends OmKeyResponse { private OmKeyInfo omKeyInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseWithFSO.java index 164e1546c381..6035fb868465 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseWithFSO.java @@ -17,9 +17,6 @@ package org.apache.hadoop.ozone.om.response.key.acl; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DIRECTORY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.FILE_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; @@ -28,13 +25,11 @@ import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.request.file.OMFileRequest; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; /** * Response for Bucket acl request for prefix layout. */ -@CleanupTableInfo(cleanupTables = { FILE_TABLE, DIRECTORY_TABLE }) public class OMKeyAclResponseWithFSO extends OMKeyAclResponse { private boolean isDirectory; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/prefix/OMPrefixAclResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/prefix/OMPrefixAclResponse.java index 3853250d8ff0..9d00e31160d3 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/prefix/OMPrefixAclResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/prefix/OMPrefixAclResponse.java @@ -17,21 +17,17 @@ package org.apache.hadoop.ozone.om.response.key.acl.prefix; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.PREFIX_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmPrefixInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for Prefix Acl request. */ -@CleanupTableInfo(cleanupTables = {PREFIX_TABLE}) public class OMPrefixAclResponse extends OMClientResponse { private OmPrefixInfo prefixInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleConfigurationDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleConfigurationDeleteResponse.java index b909bfc1cf6f..b82479e24040 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleConfigurationDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleConfigurationDeleteResponse.java @@ -17,20 +17,16 @@ package org.apache.hadoop.ozone.om.response.lifecycle; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.LIFECYCLE_CONFIGURATION_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for SetLifecycleConfiguration request. */ -@CleanupTableInfo(cleanupTables = {LIFECYCLE_CONFIGURATION_TABLE}) public class OMLifecycleConfigurationDeleteResponse extends OMClientResponse { private final String volumeName; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleConfigurationSetResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleConfigurationSetResponse.java index ce53eff33646..62f5ecc4cfba 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleConfigurationSetResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleConfigurationSetResponse.java @@ -17,21 +17,17 @@ package org.apache.hadoop.ozone.om.response.lifecycle; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.LIFECYCLE_CONFIGURATION_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmLifecycleConfiguration; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for SetLifecycleConfiguration request. */ -@CleanupTableInfo(cleanupTables = {LIFECYCLE_CONFIGURATION_TABLE}) public class OMLifecycleConfigurationSetResponse extends OMClientResponse { private final OmLifecycleConfiguration omLifecycleConfiguration; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleSaveScanStateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleSaveScanStateResponse.java index 0f94293269b7..594bf0b9cfdb 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleSaveScanStateResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleSaveScanStateResponse.java @@ -17,21 +17,18 @@ package org.apache.hadoop.ozone.om.response.lifecycle; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.LIFECYCLE_SCAN_STATE_TABLE; import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.OK; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmLifecycleScanState; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for SaveLifecycleScanState request. */ -@CleanupTableInfo(cleanupTables = {LIFECYCLE_SCAN_STATE_TABLE}) public class OMLifecycleSaveScanStateResponse extends OMClientResponse { private OmLifecycleScanState state; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleSetServiceStatusResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleSetServiceStatusResponse.java index 59f8b0963ff9..b6242c637176 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleSetServiceStatusResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle/OMLifecycleSetServiceStatusResponse.java @@ -20,7 +20,6 @@ import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -28,7 +27,6 @@ * Response for SetLifecycleServiceStatus request. * This response does not modify any database tables. */ -@CleanupTableInfo public class OMLifecycleSetServiceStatusResponse extends OMClientResponse { public OMLifecycleSetServiceStatusResponse(OMResponse omResponse) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3ExpiredMultipartUploadsAbortResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3ExpiredMultipartUploadsAbortResponse.java index dbe35f08cc7a..30e456d16cbe 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3ExpiredMultipartUploadsAbortResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3ExpiredMultipartUploadsAbortResponse.java @@ -17,13 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.multipart; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_INFO_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_PARTS_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_FILE_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_KEY_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.List; @@ -33,14 +26,11 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartAbortInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Handles response to abort expired MPUs. */ -@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, OPEN_FILE_TABLE, - DELETED_TABLE, MULTIPART_INFO_TABLE, MULTIPART_PARTS_TABLE, BUCKET_TABLE}) public class S3ExpiredMultipartUploadsAbortResponse extends AbstractS3MultipartAbortResponse { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponse.java index 0123ab11a949..2afeea41ad67 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponse.java @@ -17,9 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.multipart; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_INFO_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_KEY_TABLE; - import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Nonnull; import java.io.IOException; @@ -28,14 +25,12 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.key.OmKeyResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for S3 Initiate Multipart Upload request. */ -@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, MULTIPART_INFO_TABLE}) public class S3InitiateMultipartUploadResponse extends OmKeyResponse { private OmMultipartKeyInfo omMultipartKeyInfo; private OmKeyInfo omKeyInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java index c53720634931..2b7762172d35 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java @@ -17,10 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.multipart; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DIRECTORY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_INFO_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_FILE_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.List; @@ -32,14 +28,11 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; import org.apache.hadoop.ozone.om.request.file.OMFileRequest; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for S3 Initiate Multipart Upload request for prefix layout. */ -@CleanupTableInfo(cleanupTables = {DIRECTORY_TABLE, OPEN_FILE_TABLE, - MULTIPART_INFO_TABLE}) public class S3InitiateMultipartUploadResponseWithFSO extends S3InitiateMultipartUploadResponse { private List parentDirInfos; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java index ccf6f81d0a1d..b3a8abf70c4b 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java @@ -17,12 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.multipart; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_INFO_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_PARTS_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_KEY_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.Collections; @@ -35,14 +29,11 @@ import org.apache.hadoop.ozone.om.helpers.OmMultipartAbortInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartPartKey; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for Multipart Abort Request. */ -@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, DELETED_TABLE, - MULTIPART_INFO_TABLE, MULTIPART_PARTS_TABLE, BUCKET_TABLE}) public class S3MultipartUploadAbortResponse extends AbstractS3MultipartAbortResponse { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java index b467c3b4eed3..f6a44caedb6e 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java @@ -17,12 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.multipart; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_INFO_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_PARTS_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_FILE_TABLE; - import jakarta.annotation.Nonnull; import java.util.List; import org.apache.hadoop.ozone.om.helpers.BucketLayout; @@ -30,14 +24,11 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartPartKey; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for Multipart Abort Request - prefix layout. */ -@CleanupTableInfo(cleanupTables = {OPEN_FILE_TABLE, DELETED_TABLE, - MULTIPART_INFO_TABLE, MULTIPART_PARTS_TABLE, BUCKET_TABLE}) public class S3MultipartUploadAbortResponseWithFSO extends S3MultipartUploadAbortResponse { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java index eb391be04626..c2e8da4e95df 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java @@ -17,11 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.multipart; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_INFO_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_PARTS_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_KEY_TABLE; import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.NO_SUCH_MULTIPART_UPLOAD_ERROR; import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.OK; @@ -41,15 +36,12 @@ import org.apache.hadoop.ozone.om.helpers.OmMultipartPartInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartPartKey; import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.key.OmKeyResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for S3MultipartUploadCommitPart request. */ -@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, DELETED_TABLE, - MULTIPART_INFO_TABLE, MULTIPART_PARTS_TABLE, BUCKET_TABLE}) public class S3MultipartUploadCommitPartResponse extends OmKeyResponse { private final String multipartKey; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java index ca1d399c6ecc..d30f4788133c 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java @@ -17,12 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.multipart; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_INFO_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_PARTS_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_FILE_TABLE; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.util.Map; @@ -33,14 +27,11 @@ import org.apache.hadoop.ozone.om.helpers.OmMultipartPartInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartPartKey; import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for S3MultipartUploadCommitPartWithFSO request. */ -@CleanupTableInfo(cleanupTables = {OPEN_FILE_TABLE, DELETED_TABLE, - MULTIPART_INFO_TABLE, MULTIPART_PARTS_TABLE, BUCKET_TABLE}) public class S3MultipartUploadCommitPartResponseWithFSO extends S3MultipartUploadCommitPartResponse { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java index a1dfe4ed317d..8d3998a9000f 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java @@ -17,13 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.multipart; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_INFO_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_PARTS_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_KEY_TABLE; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.io.IOException; @@ -35,7 +28,6 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartPartKey; import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.key.OmKeyResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -47,8 +39,6 @@ * 2) Add key to KeyTable, * 3) Delete unused parts. */ -@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, KEY_TABLE, DELETED_TABLE, - MULTIPART_INFO_TABLE, MULTIPART_PARTS_TABLE, BUCKET_TABLE}) public class S3MultipartUploadCompleteResponse extends OmKeyResponse { private String multipartKey; private String multipartOpenKey; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java index 1e68e90b99df..f237c4d6de5e 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java @@ -17,13 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.multipart; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DIRECTORY_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.FILE_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_INFO_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.MULTIPART_PARTS_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.OPEN_FILE_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.List; @@ -36,7 +29,6 @@ import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartPartKey; import org.apache.hadoop.ozone.om.request.file.OMFileRequest; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** @@ -47,8 +39,6 @@ * 2) Add file to FileTable, * 3) Delete unused parts. */ -@CleanupTableInfo(cleanupTables = {OPEN_FILE_TABLE, FILE_TABLE, DELETED_TABLE, - MULTIPART_INFO_TABLE, MULTIPART_PARTS_TABLE, DIRECTORY_TABLE}) public class S3MultipartUploadCompleteResponseWithFSO extends S3MultipartUploadCompleteResponse { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/OMSetSecretResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/OMSetSecretResponse.java index c35e06d001dc..89fd94890ebe 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/OMSetSecretResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/OMSetSecretResponse.java @@ -17,8 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.security; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.S3_SECRET_TABLE; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.io.IOException; @@ -26,7 +24,6 @@ import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.S3SecretManager; import org.apache.hadoop.ozone.om.helpers.S3SecretValue; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -36,7 +33,6 @@ /** * Response for SetSecret request. */ -@CleanupTableInfo(cleanupTables = {S3_SECRET_TABLE}) public class OMSetSecretResponse extends OMClientResponse { private static final Logger LOG = diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3AssumeRoleResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3AssumeRoleResponse.java index 18ed41a55f73..7cd2925b2353 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3AssumeRoleResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3AssumeRoleResponse.java @@ -20,7 +20,6 @@ import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -28,7 +27,6 @@ * Response for AssumeRole request. * This is a stateless operation that doesn't modify any database tables. */ -@CleanupTableInfo() public class S3AssumeRoleResponse extends OMClientResponse { public S3AssumeRoleResponse(OMResponse omResponse) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3DeleteRevokedSTSTokensResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3DeleteRevokedSTSTokensResponse.java index a1b255689de5..f262362cdff2 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3DeleteRevokedSTSTokensResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3DeleteRevokedSTSTokensResponse.java @@ -17,7 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.security; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.S3_REVOKED_STS_TOKEN_TABLE; import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.OK; import jakarta.annotation.Nonnull; @@ -26,14 +25,12 @@ import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for DeleteRevokedSTSTokens request. */ -@CleanupTableInfo(cleanupTables = {S3_REVOKED_STS_TOKEN_TABLE}) public class S3DeleteRevokedSTSTokensResponse extends OMClientResponse { private final List originalAccessKeyIds; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3GetSecretResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3GetSecretResponse.java index 7013ed7711fc..911908b63f8d 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3GetSecretResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3GetSecretResponse.java @@ -17,8 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.security; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.S3_SECRET_TABLE; - import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -27,7 +25,6 @@ import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.S3SecretManager; import org.apache.hadoop.ozone.om.helpers.S3SecretValue; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -35,7 +32,6 @@ /** * Response for GetS3Secret request. */ -@CleanupTableInfo(cleanupTables = {S3_SECRET_TABLE}) public class S3GetSecretResponse extends OMClientResponse { private final S3SecretValue s3SecretValue; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3RevokeSTSTokenResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3RevokeSTSTokenResponse.java index db9233357ed2..2ad3a9a79ffe 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3RevokeSTSTokenResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3RevokeSTSTokenResponse.java @@ -17,7 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.security; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.S3_REVOKED_STS_TOKEN_TABLE; import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.OK; import jakarta.annotation.Nonnull; @@ -25,14 +24,12 @@ import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for RevokeSTSToken request. */ -@CleanupTableInfo(cleanupTables = {S3_REVOKED_STS_TOKEN_TABLE}) public class S3RevokeSTSTokenResponse extends OMClientResponse { private final String originalAccessKeyId; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3RevokeSecretResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3RevokeSecretResponse.java index 5306cccc68a5..27c541b733e8 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3RevokeSecretResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/security/S3RevokeSecretResponse.java @@ -17,15 +17,12 @@ package org.apache.hadoop.ozone.om.response.s3.security; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.S3_SECRET_TABLE; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.S3SecretManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status; @@ -33,7 +30,6 @@ /** * Response for RevokeS3Secret request. */ -@CleanupTableInfo(cleanupTables = {S3_SECRET_TABLE}) public class S3RevokeSecretResponse extends OMClientResponse { private final String kerberosID; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3DeleteObjectTaggingResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3DeleteObjectTaggingResponse.java index ae3c99819729..b76790750d19 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3DeleteObjectTaggingResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3DeleteObjectTaggingResponse.java @@ -17,22 +17,18 @@ package org.apache.hadoop.ozone.om.response.s3.tagging; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.key.OmKeyResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for delete object tagging request. */ -@CleanupTableInfo(cleanupTables = {KEY_TABLE}) public class S3DeleteObjectTaggingResponse extends OmKeyResponse { private OmKeyInfo omKeyInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3DeleteObjectTaggingResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3DeleteObjectTaggingResponseWithFSO.java index b5133d63ebe4..38ba7b8fc0f5 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3DeleteObjectTaggingResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3DeleteObjectTaggingResponseWithFSO.java @@ -17,21 +17,17 @@ package org.apache.hadoop.ozone.om.response.s3.tagging; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.FILE_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for delete object tagging request for FSO bucket. */ -@CleanupTableInfo(cleanupTables = {FILE_TABLE}) public class S3DeleteObjectTaggingResponseWithFSO extends S3DeleteObjectTaggingResponse { private long volumeId; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3PutObjectTaggingResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3PutObjectTaggingResponse.java index 4fdd0c4902fe..49514f25a35a 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3PutObjectTaggingResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3PutObjectTaggingResponse.java @@ -17,22 +17,18 @@ package org.apache.hadoop.ozone.om.response.s3.tagging; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.key.OmKeyResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for put object tagging request. */ -@CleanupTableInfo(cleanupTables = {KEY_TABLE}) public class S3PutObjectTaggingResponse extends OmKeyResponse { private OmKeyInfo omKeyInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3PutObjectTaggingResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3PutObjectTaggingResponseWithFSO.java index 157baad1a956..642a03ff4923 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3PutObjectTaggingResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tagging/S3PutObjectTaggingResponseWithFSO.java @@ -17,21 +17,17 @@ package org.apache.hadoop.ozone.om.response.s3.tagging; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.FILE_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for put object tagging request for FSO bucket. */ -@CleanupTableInfo(cleanupTables = {FILE_TABLE}) public class S3PutObjectTaggingResponseWithFSO extends S3PutObjectTaggingResponse { private long volumeId; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMSetRangerServiceVersionResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMSetRangerServiceVersionResponse.java index a02cc27461d5..faa7b1cff956 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMSetRangerServiceVersionResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMSetRangerServiceVersionResponse.java @@ -17,21 +17,17 @@ package org.apache.hadoop.ozone.om.response.s3.tenant; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.META_TABLE; - import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for OMSetRangerServiceVersionRequest. */ -@CleanupTableInfo(cleanupTables = {META_TABLE}) public class OMSetRangerServiceVersionResponse extends OMClientResponse { private String serviceVersionKey; private String serviceVersionValueStr; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantAssignAdminResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantAssignAdminResponse.java index fae19b604dd6..739899a95c46 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantAssignAdminResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantAssignAdminResponse.java @@ -17,24 +17,18 @@ package org.apache.hadoop.ozone.om.response.s3.tenant; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.TENANT_ACCESS_ID_TABLE; - import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmDBAccessIdInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for OMTenantAssignAdminRequest. */ -@CleanupTableInfo(cleanupTables = { - TENANT_ACCESS_ID_TABLE -}) public class OMTenantAssignAdminResponse extends OMClientResponse { private String accessId; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantAssignUserAccessIdResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantAssignUserAccessIdResponse.java index 81fca7b15de5..60d89971eb87 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantAssignUserAccessIdResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantAssignUserAccessIdResponse.java @@ -17,10 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.tenant; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.PRINCIPAL_TO_ACCESS_IDS_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.S3_SECRET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.TENANT_ACCESS_ID_TABLE; - import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Nonnull; import java.io.IOException; @@ -30,7 +26,6 @@ import org.apache.hadoop.ozone.om.helpers.OmDBAccessIdInfo; import org.apache.hadoop.ozone.om.helpers.OmDBUserPrincipalInfo; import org.apache.hadoop.ozone.om.helpers.S3SecretValue; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -38,11 +33,6 @@ /** * Response for OMAssignUserToTenantRequest. */ -@CleanupTableInfo(cleanupTables = { - S3_SECRET_TABLE, - TENANT_ACCESS_ID_TABLE, - PRINCIPAL_TO_ACCESS_IDS_TABLE -}) public class OMTenantAssignUserAccessIdResponse extends OMClientResponse { private S3SecretValue s3SecretValue; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantCreateResponse.java index 0ffced2b932d..c9ef4ec51e76 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantCreateResponse.java @@ -17,9 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.tenant; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.TENANT_STATE_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.VOLUME_TABLE; - import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Nonnull; import java.io.IOException; @@ -27,7 +24,6 @@ import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmDBTenantState; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; import org.apache.hadoop.ozone.storage.proto.OzoneManagerStorageProtos.PersistedUserVolumeInfo; @@ -35,10 +31,6 @@ /** * Response for OMTenantCreate request. */ -@CleanupTableInfo(cleanupTables = { - TENANT_STATE_TABLE, - VOLUME_TABLE -}) public class OMTenantCreateResponse extends OMClientResponse { private PersistedUserVolumeInfo userVolumeInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantDeleteResponse.java index c7302f628a35..e14e7c79b93d 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantDeleteResponse.java @@ -17,9 +17,6 @@ package org.apache.hadoop.ozone.om.response.s3.tenant; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.TENANT_STATE_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.VOLUME_TABLE; - import com.google.common.base.Preconditions; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -28,17 +25,12 @@ import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for DeleteTenant request. */ -@CleanupTableInfo(cleanupTables = { - TENANT_STATE_TABLE, - VOLUME_TABLE -}) public class OMTenantDeleteResponse extends OMClientResponse { private String volumeName; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantRevokeAdminResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantRevokeAdminResponse.java index 2dfa15adfe9c..c517b0dc3d0f 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantRevokeAdminResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantRevokeAdminResponse.java @@ -17,24 +17,18 @@ package org.apache.hadoop.ozone.om.response.s3.tenant; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.TENANT_ACCESS_ID_TABLE; - import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmDBAccessIdInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for OMTenantAssignAdminRequest. */ -@CleanupTableInfo(cleanupTables = { - TENANT_ACCESS_ID_TABLE -}) public class OMTenantRevokeAdminResponse extends OMClientResponse { private String accessId; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantRevokeUserAccessIdResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantRevokeUserAccessIdResponse.java index 1266f5de03ed..818b335c523a 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantRevokeUserAccessIdResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/tenant/OMTenantRevokeUserAccessIdResponse.java @@ -17,17 +17,12 @@ package org.apache.hadoop.ozone.om.response.s3.tenant; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.PRINCIPAL_TO_ACCESS_IDS_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.S3_SECRET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.TENANT_ACCESS_ID_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.S3SecretManager; import org.apache.hadoop.ozone.om.helpers.OmDBUserPrincipalInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -35,11 +30,6 @@ /** * Response for OMTenantRevokeUserAccessIdRequest. */ -@CleanupTableInfo(cleanupTables = { - S3_SECRET_TABLE, - TENANT_ACCESS_ID_TABLE, - PRINCIPAL_TO_ACCESS_IDS_TABLE -}) public class OMTenantRevokeUserAccessIdResponse extends OMClientResponse { private String principal, accessId; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/security/OMCancelDelegationTokenResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/security/OMCancelDelegationTokenResponse.java index b798b9b315b5..c51839ff01bd 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/security/OMCancelDelegationTokenResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/security/OMCancelDelegationTokenResponse.java @@ -17,15 +17,12 @@ package org.apache.hadoop.ozone.om.response.security; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELEGATION_TOKEN_TABLE; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -34,7 +31,6 @@ /** * Handle response for CancelDelegationToken request. */ -@CleanupTableInfo(cleanupTables = {DELEGATION_TOKEN_TABLE}) public class OMCancelDelegationTokenResponse extends OMClientResponse { private OzoneTokenIdentifier ozoneTokenIdentifier; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/security/OMGetDelegationTokenResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/security/OMGetDelegationTokenResponse.java index 77907241a4fc..adbc32d34c42 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/security/OMGetDelegationTokenResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/security/OMGetDelegationTokenResponse.java @@ -17,15 +17,12 @@ package org.apache.hadoop.ozone.om.response.security; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELEGATION_TOKEN_TABLE; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -34,7 +31,6 @@ /** * Handle response for GetDelegationToken request. */ -@CleanupTableInfo(cleanupTables = {DELEGATION_TOKEN_TABLE}) public class OMGetDelegationTokenResponse extends OMClientResponse { private OzoneTokenIdentifier ozoneTokenIdentifier; private long renewTime = -1L; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/security/OMRenewDelegationTokenResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/security/OMRenewDelegationTokenResponse.java index f47f2f1aea37..186d22c14a86 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/security/OMRenewDelegationTokenResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/security/OMRenewDelegationTokenResponse.java @@ -17,15 +17,12 @@ package org.apache.hadoop.ozone.om.response.security; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELEGATION_TOKEN_TABLE; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -34,7 +31,6 @@ /** * Handle response for RenewDelegationToken request. */ -@CleanupTableInfo(cleanupTables = {DELEGATION_TOKEN_TABLE}) public class OMRenewDelegationTokenResponse extends OMClientResponse { private OzoneTokenIdentifier ozoneTokenIdentifier; private long renewTime = -1L; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotCreateResponse.java index db107f0772f4..8995087df84b 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotCreateResponse.java @@ -17,25 +17,18 @@ package org.apache.hadoop.ozone.om.response.snapshot; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_INFO_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_RENAMED_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.OmSnapshotManager; import org.apache.hadoop.ozone.om.helpers.SnapshotInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for OMSnapshotCreateRequest. */ -@CleanupTableInfo(cleanupTables = { - DELETED_TABLE, SNAPSHOT_RENAMED_TABLE, SNAPSHOT_INFO_TABLE}) public class OMSnapshotCreateResponse extends OMClientResponse { private SnapshotInfo snapshotInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotDeleteResponse.java index 508ad53cba03..80c016d4702d 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotDeleteResponse.java @@ -17,21 +17,17 @@ package org.apache.hadoop.ozone.om.response.snapshot; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_INFO_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.SnapshotInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for OMSnapshotDeleteRequest. */ -@CleanupTableInfo(cleanupTables = {SNAPSHOT_INFO_TABLE}) public class OMSnapshotDeleteResponse extends OMClientResponse { private String tableKey; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotMoveDeletedKeysResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotMoveDeletedKeysResponse.java index f5558dcfbf9d..0651a8e98731 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotMoveDeletedKeysResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotMoveDeletedKeysResponse.java @@ -17,7 +17,6 @@ package org.apache.hadoop.ozone.om.response.snapshot; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_INFO_TABLE; import static org.apache.hadoop.ozone.om.snapshot.SnapshotUtils.createMergedRepeatedOmKeyInfoFromDeletedTableEntry; import jakarta.annotation.Nonnull; @@ -34,7 +33,6 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; import org.apache.hadoop.ozone.om.helpers.SnapshotInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -44,7 +42,6 @@ /** * Response for OMSnapshotMoveDeletedKeysRequest. */ -@CleanupTableInfo(cleanupTables = {SNAPSHOT_INFO_TABLE}) public class OMSnapshotMoveDeletedKeysResponse extends OMClientResponse { private SnapshotInfo fromSnapshot; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotMoveTableKeysResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotMoveTableKeysResponse.java index e70b35d94036..ea734d1fdd5b 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotMoveTableKeysResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotMoveTableKeysResponse.java @@ -17,7 +17,6 @@ package org.apache.hadoop.ozone.om.response.snapshot; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_INFO_TABLE; import static org.apache.hadoop.ozone.om.lock.DAGLeveledResource.SNAPSHOT_DB_CONTENT_LOCK; import static org.apache.hadoop.ozone.om.snapshot.SnapshotUtils.createMergedRepeatedOmKeyInfoFromDeletedTableEntry; @@ -39,7 +38,6 @@ import org.apache.hadoop.ozone.om.helpers.SnapshotInfo; import org.apache.hadoop.ozone.om.lock.IOzoneManagerLock; import org.apache.hadoop.ozone.om.lock.OMLockDetails; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotMoveKeyInfos; @@ -48,7 +46,6 @@ /** * Response for OMSnapshotMoveDeletedKeysRequest. */ -@CleanupTableInfo(cleanupTables = {SNAPSHOT_INFO_TABLE}) public class OMSnapshotMoveTableKeysResponse extends OMClientResponse { private long bucketId; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotPurgeResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotPurgeResponse.java index 852a7a637234..f0f210197545 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotPurgeResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotPurgeResponse.java @@ -17,8 +17,6 @@ package org.apache.hadoop.ozone.om.response.snapshot; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_INFO_TABLE; - import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Nonnull; import java.io.IOException; @@ -30,21 +28,15 @@ import org.apache.hadoop.ozone.om.OmMetadataManagerImpl; import org.apache.hadoop.ozone.om.OmSnapshotManager; import org.apache.hadoop.ozone.om.helpers.SnapshotInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.om.snapshot.OmSnapshotLocalDataManager; import org.apache.hadoop.ozone.om.snapshot.OmSnapshotLocalDataManager.WritableOmSnapshotLocalDataProvider; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Response for OMSnapshotPurgeRequest. */ -@CleanupTableInfo(cleanupTables = {SNAPSHOT_INFO_TABLE}) public class OMSnapshotPurgeResponse extends OMClientResponse { - private static final Logger LOG = - LoggerFactory.getLogger(OMSnapshotPurgeResponse.class); private final List snapshotDbKeys; private final Map updatedSnapInfos; private final TransactionInfo transactionInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotRenameResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotRenameResponse.java index cfc107cfec4d..4b0660271a19 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotRenameResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotRenameResponse.java @@ -17,21 +17,17 @@ package org.apache.hadoop.ozone.om.response.snapshot; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_INFO_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.SnapshotInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; /** * Response for OMSnapshotRenameRequest. */ -@CleanupTableInfo(cleanupTables = {SNAPSHOT_INFO_TABLE}) public class OMSnapshotRenameResponse extends OMClientResponse { private String snapshotOldName; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotSetPropertyResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotSetPropertyResponse.java index 5d0f8d642b49..e15323e0cf75 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotSetPropertyResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotSetPropertyResponse.java @@ -17,22 +17,18 @@ package org.apache.hadoop.ozone.om.response.snapshot; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.SNAPSHOT_INFO_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.Collection; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.SnapshotInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for OMSnapshotSetPropertyRequest. */ -@CleanupTableInfo(cleanupTables = {SNAPSHOT_INFO_TABLE}) public class OMSnapshotSetPropertyResponse extends OMClientResponse { private final Collection updatedSnapInfos; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMCancelPrepareResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMCancelPrepareResponse.java index 8e150d696bd6..2f014106d417 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMCancelPrepareResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMCancelPrepareResponse.java @@ -17,19 +17,15 @@ package org.apache.hadoop.ozone.om.response.upgrade; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.TRANSACTION_INFO_TABLE; - import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; /** * Response for cancel prepare. */ -@CleanupTableInfo(cleanupTables = {TRANSACTION_INFO_TABLE}) public class OMCancelPrepareResponse extends OMClientResponse { public OMCancelPrepareResponse( OzoneManagerProtocolProtos.OMResponse omResponse) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMFinalizeUpgradeResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMFinalizeUpgradeResponse.java index 49bb6fc86587..ea68fa902be9 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMFinalizeUpgradeResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMFinalizeUpgradeResponse.java @@ -18,12 +18,10 @@ package org.apache.hadoop.ozone.om.response.upgrade; import static org.apache.hadoop.ozone.OzoneConsts.LAYOUT_VERSION_KEY; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.META_TABLE; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.slf4j.Logger; @@ -32,7 +30,6 @@ /** * Response for finalizeUpgrade request. */ -@CleanupTableInfo(cleanupTables = {META_TABLE}) public class OMFinalizeUpgradeResponse extends OMClientResponse { private static final Logger LOG = LoggerFactory.getLogger(OMFinalizeUpgradeResponse.class); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMPrepareResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMPrepareResponse.java index d9e8901554b0..e995e1e01cb0 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMPrepareResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMPrepareResponse.java @@ -18,20 +18,17 @@ package org.apache.hadoop.ozone.om.response.upgrade; import static org.apache.hadoop.ozone.OzoneConsts.PREPARE_MARKER_KEY; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.TRANSACTION_INFO_TABLE; import java.io.IOException; import org.apache.hadoop.hdds.utils.TransactionInfo; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; /** * Response for prepare request. */ -@CleanupTableInfo(cleanupTables = {TRANSACTION_INFO_TABLE}) public class OMPrepareResponse extends OMClientResponse { private long prepareIndex = -1; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/util/OMEchoRPCWriteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/util/OMEchoRPCWriteResponse.java index 0fd7e6a31617..4c66b055149b 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/util/OMEchoRPCWriteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/util/OMEchoRPCWriteResponse.java @@ -20,14 +20,12 @@ import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for EchoRPC request (write). */ -@CleanupTableInfo public class OMEchoRPCWriteResponse extends OMClientResponse { public OMEchoRPCWriteResponse(OMResponse omResponse) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMQuotaRepairResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMQuotaRepairResponse.java index 5907933a8f01..7f913c61d2d1 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMQuotaRepairResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMQuotaRepairResponse.java @@ -17,9 +17,6 @@ package org.apache.hadoop.ozone.om.response.volume; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.VOLUME_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.Map; @@ -29,14 +26,12 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.request.volume.OMQuotaRepairRequest; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for {@link OMQuotaRepairRequest} request. */ -@CleanupTableInfo(cleanupTables = {VOLUME_TABLE, BUCKET_TABLE}) public class OMQuotaRepairResponse extends OMClientResponse { private Map volumeArgsMap; private Map, OmBucketInfo> volBucketInfoMap; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeAclOpResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeAclOpResponse.java index dbe47c9e8775..a55ba45ce072 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeAclOpResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeAclOpResponse.java @@ -17,22 +17,18 @@ package org.apache.hadoop.ozone.om.response.volume; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.VOLUME_TABLE; - import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for om volume acl operation request. */ -@CleanupTableInfo(cleanupTables = {VOLUME_TABLE}) public class OMVolumeAclOpResponse extends OMClientResponse { private OmVolumeArgs omVolumeArgs; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeCreateResponse.java index 60b0029d777c..b3b7b91185b3 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeCreateResponse.java @@ -17,15 +17,12 @@ package org.apache.hadoop.ozone.om.response.volume; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.VOLUME_TABLE; - import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; import org.apache.hadoop.ozone.storage.proto.OzoneManagerStorageProtos.PersistedUserVolumeInfo; @@ -33,7 +30,6 @@ /** * Response for CreateVolume request. */ -@CleanupTableInfo(cleanupTables = VOLUME_TABLE) public class OMVolumeCreateResponse extends OMClientResponse { private PersistedUserVolumeInfo userVolumeInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeDeleteResponse.java index cb731dd9a33a..46ae1f38784c 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeDeleteResponse.java @@ -17,13 +17,10 @@ package org.apache.hadoop.ozone.om.response.volume; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.VOLUME_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; import org.apache.hadoop.ozone.storage.proto.OzoneManagerStorageProtos.PersistedUserVolumeInfo; @@ -31,7 +28,6 @@ /** * Response for DeleteVolume request. */ -@CleanupTableInfo(cleanupTables = {VOLUME_TABLE}) public class OMVolumeDeleteResponse extends OMClientResponse { private String volume; private String owner; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetOwnerResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetOwnerResponse.java index e9118e97b5ba..ea8ae2d7860a 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetOwnerResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetOwnerResponse.java @@ -17,14 +17,11 @@ package org.apache.hadoop.ozone.om.response.volume; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.VOLUME_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -33,7 +30,6 @@ /** * Response for set owner request. */ -@CleanupTableInfo(cleanupTables = {VOLUME_TABLE}) public class OMVolumeSetOwnerResponse extends OMClientResponse { private String oldOwner; private PersistedUserVolumeInfo oldOwnerVolumeList; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetQuotaResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetQuotaResponse.java index d1e699024cf1..7ebe9fb4f2a6 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetQuotaResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetQuotaResponse.java @@ -17,21 +17,17 @@ package org.apache.hadoop.ozone.om.response.volume; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.VOLUME_TABLE; - import jakarta.annotation.Nonnull; import java.io.IOException; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; /** * Response for set quota request. */ -@CleanupTableInfo(cleanupTables = {VOLUME_TABLE}) public class OMVolumeSetQuotaResponse extends OMClientResponse { private OmVolumeArgs omVolumeArgs; diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java index 34eb8a7a9440..8e244b9709d6 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java @@ -20,7 +20,6 @@ import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS; import static org.apache.hadoop.ozone.OzoneConsts.TRANSACTION_INFO_KEY; import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE; -import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.VOLUME_TABLE; import static org.apache.ozone.test.GenericTestUtils.waitFor; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,7 +39,6 @@ import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.OmMetadataManagerImpl; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; -import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateBucketResponse; @@ -101,11 +99,6 @@ public void testDoubleBufferWithDummyResponse() throws Exception { assertEquals(0, metrics.getTotalNumOfFlushedTransactions()); assertEquals(0, metrics.getMaxNumberOfTransactionsFlushedInOneIteration()); - OMDummyCreateBucketResponse annotatedResponse = - createDummyBucketResponse(UUID.randomUUID().toString()); - annotatedResponse.addCleanupTables(Collections.singleton(VOLUME_TABLE)); - assertAnnotatedCleanupTakesPrecedence(annotatedResponse); - OMTrackedDummyCreateBucketResponse trackedResponse = createTrackedDummyBucketResponse(UUID.randomUUID().toString()); assertBucketCacheCleanup(trackedResponse); @@ -114,7 +107,7 @@ public void testDoubleBufferWithDummyResponse() throws Exception { doubleBuffer.add(createDummyBucketResponse(volumeName), TermIndex.valueOf(term, trxId.incrementAndGet())); } - int totalBucketCount = bucketCount + 2; + int totalBucketCount = bucketCount + 1; waitFor(() -> metrics.getTotalNumOfFlushedTransactions() == totalBucketCount, 100, 60000); @@ -155,19 +148,6 @@ private void assertBucketCacheCleanup( waitFor(() -> Iterators.size(omMetadataManager.getBucketTable().cacheIterator()) == 0, 100, 5000); } - private void assertAnnotatedCleanupTakesPrecedence( - AbstractDummyCreateBucketResponse response) throws Exception { - long transactionIndex = trxId.get() + 1; - String volumeName = response.getOmBucketInfo().getVolumeName(); - omMetadataManager.getVolumeTable().addCacheEntry( - new CacheKey<>(volumeName), CacheValue.get(transactionIndex)); - - assertBucketCacheCleanup(response); - - assertEquals(1, Iterators.size(omMetadataManager.getVolumeTable().cacheIterator())); - omMetadataManager.getVolumeTable().cleanupCache(Collections.singletonList(transactionIndex)); - } - /** * Create DummyBucketCreate response. */ @@ -230,7 +210,6 @@ public void addToDBBatch(OMMetadataManager omMetadataManager, } } - @CleanupTableInfo(cleanupTables = {BUCKET_TABLE}) private static class OMDummyCreateBucketResponse extends AbstractDummyCreateBucketResponse { OMDummyCreateBucketResponse(OmBucketInfo omBucketInfo, diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestCleanupTableInfo.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestCleanupTableInfo.java deleted file mode 100644 index fb8b2eb6f77e..000000000000 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestCleanupTableInfo.java +++ /dev/null @@ -1,387 +0,0 @@ -/* - * 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; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import com.google.common.collect.Iterators; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Modifier; -import java.nio.file.Path; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import org.apache.hadoop.hdds.client.BlockID; -import org.apache.hadoop.hdds.client.ReplicationConfig; -import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.hdds.protocol.StorageType; -import org.apache.hadoop.hdds.protocol.proto.HddsProtos; -import org.apache.hadoop.hdds.protocol.proto.HddsProtos.DatanodeDetailsProto; -import org.apache.hadoop.hdds.protocol.proto.HddsProtos.Pipeline; -import org.apache.hadoop.hdds.server.ServerUtils; -import org.apache.hadoop.hdds.utils.db.cache.CacheKey; -import org.apache.hadoop.hdds.utils.db.cache.CacheValue; -import org.apache.hadoop.ozone.audit.AuditLogger; -import org.apache.hadoop.ozone.om.OMMetadataManager; -import org.apache.hadoop.ozone.om.OMMetrics; -import org.apache.hadoop.ozone.om.OMPerformanceMetrics; -import org.apache.hadoop.ozone.om.OmMetadataManagerImpl; -import org.apache.hadoop.ozone.om.OzoneManager; -import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; -import org.apache.hadoop.ozone.om.lock.OzoneLockProvider; -import org.apache.hadoop.ozone.om.request.file.OMFileCreateRequest; -import org.apache.hadoop.ozone.om.request.key.OMKeyCreateRequest; -import org.apache.hadoop.ozone.om.response.file.OMFileCreateResponse; -import org.apache.hadoop.ozone.om.response.key.OMKeyCreateResponse; -import org.apache.hadoop.ozone.om.response.key.OMOpenKeysDeleteResponse; -import org.apache.hadoop.ozone.om.response.lifecycle.OMLifecycleSetServiceStatusResponse; -import org.apache.hadoop.ozone.om.response.s3.security.S3AssumeRoleResponse; -import org.apache.hadoop.ozone.om.response.util.OMEchoRPCWriteResponse; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateFileRequest; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateKeyRequest; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyLocation; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.api.io.TempDir; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; -import org.reflections.Reflections; - -/** - * The test checks whether all {@link OMClientResponse} have defined the - * {@link CleanupTableInfo} annotation. - * For certain requests it check whether it is properly defined not just the - * fact that it is defined. - */ -@ExtendWith(MockitoExtension.class) -public class TestCleanupTableInfo { - private static final String TEST_VOLUME_NAME = "testVol"; - private static final String TEST_BUCKET_NAME = "testBucket"; - private static final String TEST_KEY = "/foo/bar/baz/key"; - private static final HddsProtos.BlockID TEST_BLOCK_ID = - new BlockID(1, 1).getProtobuf(); - public static final String OM_RESPONSE_PACKAGE = - "org.apache.hadoop.ozone.om.response"; - - @TempDir - private Path folder; - - @Mock - private OMMetrics omMetrics; - - @Mock - private OMPerformanceMetrics perfMetrics; - - @Mock - private OzoneManager om; - - /** - * Creates a mock Ozone Manager object. - * Defined behaviour in the mock: - * - returns the specified metrics instance - * - returns the specified metadataManager - * - resolves the bucket links to themselves (no symlinks) - * - disables ACLs - * - provides an audit logger - * - * @throws IOException should not happen but declared in mocked methods - */ - @BeforeEach - public void setupOzoneManagerMock() - throws IOException { - OMMetadataManager metaMgr = createOMMetadataManagerSpy(); - when(om.getMetrics()).thenReturn(omMetrics); - when(om.getMetadataManager()).thenReturn(metaMgr); - when(om.getAuditLogger()).thenReturn(mock(AuditLogger.class)); - when(om.getDefaultReplicationConfig()).thenReturn(ReplicationConfig - .getDefault(new OzoneConfiguration())); - addVolumeToMetaTable(aVolumeArgs()); - addBucketToMetaTable(aBucketInfo()); - } - - @Test - public void checkAnnotationAndTableName() { - OMMetadataManager omMetadataManager = om.getMetadataManager(); - - Set tables = omMetadataManager.listTableNames(); - Set> subTypes = responseClasses(); - // OMEchoRPCWriteResponse does not need CleanupTable. - subTypes.remove(OMEchoRPCWriteResponse.class); - subTypes.remove(DummyOMClientResponse.class); - subTypes.remove(OMLifecycleSetServiceStatusResponse.class); - subTypes.remove(OMOpenKeysDeleteResponse.class); - subTypes.remove(S3AssumeRoleResponse.class); - assertFalse(OMOpenKeysDeleteResponse.class.isAnnotationPresent(CleanupTableInfo.class)); - subTypes.forEach(aClass -> { - if (Modifier.isAbstract(aClass.getModifiers())) { - assertFalse(aClass.isAnnotationPresent(CleanupTableInfo.class), - aClass + " is an abstract class and should not contain CleanupTableInfo annotations"); - return; - } else { - assertTrue(aClass.isAnnotationPresent(CleanupTableInfo.class), - aClass + " does not have annotation of" + - " CleanupTableInfo"); - } - CleanupTableInfo annotation = - aClass.getAnnotation(CleanupTableInfo.class); - assertNotNull(annotation, "CleanupTableInfo is null for class " + aClass.getSimpleName()); - String[] cleanupTables = annotation.cleanupTables(); - boolean cleanupAll = annotation.cleanupAll(); - if (cleanupTables.length >= 1) { - assertTrue( - Arrays.stream(cleanupTables).allMatch(tables::contains) - ); - - } else { - assertTrue(cleanupAll); - } - }); - reset(om); - } - - private Set> responseClasses() { - Reflections reflections = new Reflections(OM_RESPONSE_PACKAGE); - return reflections.getSubTypesOf(OMClientResponse.class); - } - - @Test - public void testFileCreateRequestSetsAllTouchedTableCachesForEviction() { - OMFileCreateRequest request = anOMFileCreateRequest(); - Map cacheItemCount = recordCacheItemCounts(); - - request.validateAndUpdateCache(om, 1); - - assertCacheItemCounts(cacheItemCount, OMFileCreateResponse.class); - verify(omMetrics, times(1)).incNumCreateFile(); - } - - @Test - public void testKeyCreateRequestSetsAllTouchedTableCachesForEviction() { - OMKeyCreateRequest request = anOMKeyCreateRequest(); - when(om.getEnableFileSystemPaths()).thenReturn(true); - when(om.getOzoneLockProvider()).thenReturn( - new OzoneLockProvider(false, false)); - when(om.getPerfMetrics()).thenReturn(perfMetrics); - - Map cacheItemCount = recordCacheItemCounts(); - - request.validateAndUpdateCache(om, 1); - - assertCacheItemCounts(cacheItemCount, OMKeyCreateResponse.class); - verify(omMetrics, times(1)).incNumKeyAllocates(); - } - - private Map recordCacheItemCounts() { - Map cacheItemCount = new HashMap<>(); - for (String tableName : om.getMetadataManager().listTableNames()) { - cacheItemCount.put( - tableName, - Iterators.size( - om.getMetadataManager().getTable(tableName).cacheIterator() - ) - ); - } - return cacheItemCount; - } - - private void assertCacheItemCounts( - Map cacheItemCount, - Class responseClass - ) { - CleanupTableInfo ann = responseClass.getAnnotation(CleanupTableInfo.class); - List cleanup = Arrays.asList(ann.cleanupTables()); - for (String tableName : om.getMetadataManager().listTableNames()) { - if (!cleanup.contains(tableName)) { - assertEquals(cacheItemCount.get(tableName).intValue(), - Iterators.size( - om.getMetadataManager().getTable(tableName).cacheIterator() - ), "Cache item count of table " + tableName); - } - } - } - - /** - * Adds the volume info to the volumeTable in the MetadataManager, and also - * add the value to the table's cache. - * - * @param volumeArgs the OMVolumeArgs object specifying the volume propertes - * @throws IOException if an IO issue occurs while wrtiing to RocksDB - */ - private void addVolumeToMetaTable(OmVolumeArgs volumeArgs) - throws IOException { - String volumeKey = om.getMetadataManager().getVolumeKey(TEST_VOLUME_NAME); - om.getMetadataManager().getVolumeTable().put(volumeKey, volumeArgs); - om.getMetadataManager().getVolumeTable().addCacheEntry( - new CacheKey<>(volumeKey), - CacheValue.get(2, volumeArgs) - ); - } - - /** - * Adds the bucket info to the bucketTable in the MetadataManager, and also - * adds the value to the table's cache. - * - * @param bucketInfo the OMBucketInfo object specifying the bucket properties - * @throws IOException if an IO issue occurs while writing to RocksDB - */ - private void addBucketToMetaTable(OmBucketInfo bucketInfo) - throws IOException { - String bucketKey = om.getMetadataManager() - .getBucketKey(bucketInfo.getVolumeName(), bucketInfo.getBucketName()); - om.getMetadataManager().getBucketTable().put(bucketKey, bucketInfo); - om.getMetadataManager().getBucketTable().addCacheEntry( - new CacheKey<>(bucketKey), - CacheValue.get(1, bucketInfo) - ); - } - - /** - * Creates a spy object over an instantiated OMMetadataManager, giving the - * possibility to redefine behaviour. In the current implementation - * there isn't any behaviour which is redefined. - * - * @return the OMMetadataManager spy instance created. - * @throws IOException if I/O error occurs in setting up data store for the - * metadata manager. - */ - private OMMetadataManager createOMMetadataManagerSpy() throws IOException { - OzoneConfiguration conf = new OzoneConfiguration(); - File newFolder = folder.toFile(); - if (!newFolder.exists()) { - assertTrue(newFolder.mkdirs()); - } - ServerUtils.setOzoneMetaDirPath(conf, newFolder.toString()); - return spy(new OmMetadataManagerImpl(conf, null)); - } - - private OMFileCreateRequest anOMFileCreateRequest() { - OMRequest protoRequest = mock(OMRequest.class); - when(protoRequest.getCreateFileRequest()).thenReturn(aCreateFileRequest()); - when(protoRequest.getCmdType()).thenReturn(Type.CreateFile); - when(protoRequest.getTraceID()).thenReturn(""); - return new OMFileCreateRequest(protoRequest, - aBucketInfo().getBucketLayout()); - } - - private OMKeyCreateRequest anOMKeyCreateRequest() { - OMRequest protoRequest = mock(OMRequest.class); - when(protoRequest.getCreateKeyRequest()).thenReturn(aKeyCreateRequest()); - when(protoRequest.getCmdType()).thenReturn(Type.CreateKey); - when(protoRequest.getTraceID()).thenReturn(""); - return new OMKeyCreateRequest(protoRequest, - aBucketInfo().getBucketLayout()); - } - - private OmBucketInfo aBucketInfo() { - return OmBucketInfo.newBuilder() - .setVolumeName(TEST_VOLUME_NAME) - .setBucketName(TEST_BUCKET_NAME) - .setIsVersionEnabled(false) - .setStorageType(StorageType.DEFAULT) - .build(); - } - - private OmVolumeArgs aVolumeArgs() { - return OmVolumeArgs.newBuilder() - .setAdminName("admin") - .setOwnerName("owner") - .setVolume(TEST_VOLUME_NAME) - .build(); - } - - private CreateFileRequest aCreateFileRequest() { - return CreateFileRequest.newBuilder() - .setKeyArgs(aKeyArgs()) - .setIsRecursive(true) - .setIsOverwrite(false) - .setClientID(1L) - .build(); - } - - private CreateKeyRequest aKeyCreateRequest() { - return CreateKeyRequest.newBuilder() - .setKeyArgs(aKeyArgs()) - .setClientID(1L) - .build(); - } - - private KeyArgs aKeyArgs() { - return KeyArgs.newBuilder() - .setVolumeName(TEST_VOLUME_NAME) - .setBucketName(TEST_BUCKET_NAME) - .setKeyName(TEST_KEY) - .setDataSize(512L) - .addKeyLocations(aKeyLocation(TEST_BLOCK_ID)) - .addKeyLocations(aKeyLocation(TEST_BLOCK_ID)) - .addKeyLocations(aKeyLocation(TEST_BLOCK_ID)) - .build(); - } - - private KeyLocation aKeyLocation( - HddsProtos.BlockID blockID) { - return KeyLocation.newBuilder() - .setBlockID(blockID) - .setOffset(0) - .setLength(512) - .setCreateVersion(0) - .setPipeline(aPipeline()) - .build(); - } - - private Pipeline aPipeline() { - return Pipeline.newBuilder() - .setId(aPipelineID()) - .addMembers(aDatanodeDetailsProto("192.168.1.1", "host1")) - .addMembers(aDatanodeDetailsProto("192.168.1.2", "host2")) - .addMembers(aDatanodeDetailsProto("192.168.1.3", "host3")) - .build(); - } - - private DatanodeDetailsProto aDatanodeDetailsProto(String s, - String host1) { - return DatanodeDetailsProto.newBuilder() - .setUuid(UUID.randomUUID().toString()) - .setIpAddress(s) - .setHostName(host1) - .build(); - } - - private HddsProtos.PipelineID aPipelineID() { - return HddsProtos.PipelineID.newBuilder() - .setId(UUID.randomUUID().toString()) - .build(); - } -} diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java index 0a5cc3301861..f2f0277ee3bc 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java @@ -39,7 +39,6 @@ import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; -import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestWithFSO; import org.apache.hadoop.ozone.om.response.OMResponseTestUtils; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -98,7 +97,6 @@ public void testAddToDBBatch() throws Exception { OMDirectoryCreateResponseWithFSO omDirectoryCreateResponseWithFSO = new OMDirectoryCreateResponseWithFSO(omResponse, volumeId, bucketId, omDirInfo, new ArrayList<>(), - OMDirectoryCreateRequestWithFSO.Result.SUCCESS, BucketLayout.FILE_SYSTEM_OPTIMIZED, omBucketInfo); omDirectoryCreateResponseWithFSO