This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 5e5d04c9be HDDS-8531. Remove outdated/stale code around
TrashRecoverRequest. (#4656)
5e5d04c9be is described below
commit 5e5d04c9be0b9c36aaf21d4193c4c68a8b7c8cca
Author: Tsz-Wo Nicholas Sze <[email protected]>
AuthorDate: Thu May 4 14:40:27 2023 -0700
HDDS-8531. Remove outdated/stale code around TrashRecoverRequest. (#4656)
---
.../om/ratis/utils/OzoneManagerRatisUtils.java | 3 -
.../om/request/key/OMTrashRecoverRequest.java | 143 ---------------------
.../om/response/key/OMTrashRecoverResponse.java | 70 ----------
3 files changed, 216 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
index 0226701137..b092e05850 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
@@ -51,7 +51,6 @@ import
org.apache.hadoop.ozone.om.request.file.OMRecoverLeaseRequest;
import org.apache.hadoop.ozone.om.request.key.OMKeyPurgeRequest;
import org.apache.hadoop.ozone.om.request.key.OMDirectoriesPurgeRequestWithFSO;
import org.apache.hadoop.ozone.om.request.key.OMOpenKeysDeleteRequest;
-import org.apache.hadoop.ozone.om.request.key.OMTrashRecoverRequest;
import org.apache.hadoop.ozone.om.request.key.acl.OMKeyAddAclRequest;
import org.apache.hadoop.ozone.om.request.key.acl.OMKeyAddAclRequestWithFSO;
import org.apache.hadoop.ozone.om.request.key.acl.OMKeyRemoveAclRequest;
@@ -183,8 +182,6 @@ public final class OzoneManagerRatisUtils {
return new OMRenewDelegationTokenRequest(omRequest);
case GetS3Secret:
return new S3GetSecretRequest(omRequest);
- case RecoverTrash:
- return new OMTrashRecoverRequest(omRequest);
case FinalizeUpgrade:
return new OMFinalizeUpgradeRequest(omRequest);
case Prepare:
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMTrashRecoverRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMTrashRecoverRequest.java
deleted file mode 100644
index e9d0b0b312..0000000000
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMTrashRecoverRequest.java
+++ /dev/null
@@ -1,143 +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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.request.key;
-
-import java.io.IOException;
-
-import com.google.common.base.Preconditions;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.hadoop.ozone.om.ResolvedBucket;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
-import org.apache.hadoop.ozone.om.response.key.OMTrashRecoverResponse;
-import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.hadoop.ozone.om.OMMetadataManager;
-import org.apache.hadoop.ozone.om.OzoneManager;
-import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
- .RecoverTrashRequest;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
- .OMResponse;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
- .OMRequest;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
-import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status;
-
-import static
org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
-
-/**
- * Handles RecoverTrash request.
- */
-public class OMTrashRecoverRequest extends OMKeyRequest {
- private static final Logger LOG =
- LoggerFactory.getLogger(OMTrashRecoverRequest.class);
-
- public OMTrashRecoverRequest(OMRequest omRequest) {
- super(omRequest);
- }
-
- @Override
- public OMRequest preExecute(OzoneManager ozoneManager) {
- RecoverTrashRequest recoverTrashRequest = getOmRequest()
- .getRecoverTrashRequest();
- Preconditions.checkNotNull(recoverTrashRequest);
-
- return getOmRequest().toBuilder().build();
- }
-
- @Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex,
- OzoneManagerDoubleBufferHelper ozoneManagerDoubleBufferHelper) {
- RecoverTrashRequest recoverTrashRequest = getOmRequest()
- .getRecoverTrashRequest();
- Preconditions.checkNotNull(recoverTrashRequest);
-
- String volumeName = recoverTrashRequest.getVolumeName();
- String bucketName = recoverTrashRequest.getBucketName();
- String keyName = recoverTrashRequest.getKeyName();
- String destinationBucket = recoverTrashRequest.getDestinationBucket();
-
- /** TODO: HDDS-2818. New Metrics for Trash Key Recover and Fails.
- * OMMetrics omMetrics = ozoneManager.getMetrics();
- */
-
- OMResponse.Builder omResponse = OMResponse.newBuilder()
- .setCmdType(Type.RecoverTrash).setStatus(Status.OK)
- .setSuccess(true);
-
- OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
- boolean acquireLock = false;
- OMClientResponse omClientResponse = null;
- try {
- ResolvedBucket bucket = ozoneManager.resolveBucketLink(
- Pair.of(volumeName, destinationBucket), this);
- volumeName = bucket.realVolume();
- destinationBucket = bucket.realBucket();
-
- // Check acl for the destination bucket.
- checkBucketAcls(ozoneManager, volumeName, destinationBucket, keyName,
- IAccessAuthorizer.ACLType.WRITE);
-
- acquireLock = omMetadataManager.getLock()
- .acquireWriteLock(BUCKET_LOCK, volumeName, destinationBucket);
-
- // Validate.
- validateBucketAndVolume(omMetadataManager, volumeName, bucketName);
- validateBucketAndVolume(omMetadataManager, volumeName,
destinationBucket);
-
-
- /** TODO: HDDS-2425. HDDS-2426.
- * Update cache.
- * omMetadataManager.getKeyTable().addCacheEntry(
- * new CacheKey<>(),
- * new CacheValue<>()
- * );
- *
- * Execute recovering trash in non-existing bucket.
- * Execute recovering trash in existing bucket.
- * omClientResponse = new OMTrashRecoverResponse(omKeyInfo,
- * omResponse.setRecoverTrashResponse(
- * RecoverTrashResponse.newBuilder())
- * .build());
- */
- omClientResponse = null;
-
- } catch (IOException ex) {
- LOG.error("Fail for recovering trash.", ex);
- omClientResponse = new OMTrashRecoverResponse(null,
- createErrorOMResponse(omResponse, ex), getBucketLayout());
- } finally {
- if (omClientResponse != null) {
- omClientResponse.setFlushFuture(
- ozoneManagerDoubleBufferHelper.add(omClientResponse,
- transactionLogIndex));
- }
- if (acquireLock) {
- omMetadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
- destinationBucket);
- }
- }
-
- return omClientResponse;
- }
-
-}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMTrashRecoverResponse.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMTrashRecoverResponse.java
deleted file mode 100644
index 41a41fe642..0000000000
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMTrashRecoverResponse.java
+++ /dev/null
@@ -1,70 +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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.key;
-
-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.helpers.RepeatedOmKeyInfo;
-import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
- .OMResponse;
-import org.apache.hadoop.hdds.utils.db.BatchOperation;
-
-import java.io.IOException;
-import javax.annotation.Nullable;
-import javax.annotation.Nonnull;
-
-import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.KEY_TABLE;
-
-/**
- * Response for RecoverTrash request.
- */
-@CleanupTableInfo(cleanupTables = {KEY_TABLE})
-public class OMTrashRecoverResponse extends OmKeyResponse {
-
- private OmKeyInfo omKeyInfo;
-
- public OMTrashRecoverResponse(@Nullable OmKeyInfo omKeyInfo,
- @Nonnull OMResponse omResponse, BucketLayout bucketLayout) {
- super(omResponse, bucketLayout);
- this.omKeyInfo = omKeyInfo;
- }
-
- @Override
- public void addToDBBatch(OMMetadataManager omMetadataManager,
- BatchOperation batchOperation) throws IOException {
-
- /* TODO: HDDS-2425. HDDS-2426. */
- String trashKey = omMetadataManager
- .getOzoneKey(omKeyInfo.getVolumeName(),
- omKeyInfo.getBucketName(), omKeyInfo.getKeyName());
- String deleteKey = omMetadataManager.getOzoneDeletePathKey(
- omKeyInfo.getObjectID(), trashKey);
- RepeatedOmKeyInfo repeatedOmKeyInfo = omMetadataManager
- .getDeletedTable().get(deleteKey);
- if (repeatedOmKeyInfo.getOmKeyInfoList().contains(omKeyInfo)) {
- omMetadataManager.getDeletedTable()
- .deleteWithBatch(batchOperation, omKeyInfo.getKeyName());
- /* TODO: trashKey should be updated to destinationBucket. */
- omMetadataManager.getKeyTable(getBucketLayout())
- .putWithBatch(batchOperation, trashKey, omKeyInfo);
- }
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
