errose28 commented on a change in pull request #2857:
URL: https://github.com/apache/ozone/pull/2857#discussion_r758859706
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantDeleteRequest.java
##########
@@ -18,33 +18,260 @@
*/
package org.apache.hadoop.ozone.om.request.s3.tenant;
+import com.google.common.base.Optional;
+import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
+import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
+import org.apache.hadoop.ozone.OzoneConsts;
+import org.apache.hadoop.ozone.audit.OMAction;
+import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.OMMultiTenantManager;
import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.exceptions.OMException;
+import org.apache.hadoop.ozone.om.helpers.OmDBTenantInfo;
+import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
+import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
import org.apache.hadoop.ozone.om.request.volume.OMVolumeRequest;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.s3.tenant.OMTenantDeleteResponse;
+import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DeleteTenantRequest;
+import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DeleteVolumeRequest;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
+import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
+import org.apache.hadoop.ozone.security.acl.OzoneObj;
+import org.apache.hadoop.ozone.storage.proto.OzoneManagerStorageProtos;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.TENANT_NOT_EMPTY;
+import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.TENANT_NOT_FOUND;
+import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.VOLUME_IN_USE;
+import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.VOLUME_NOT_EMPTY;
+import static
org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.USER_LOCK;
+import static
org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.VOLUME_LOCK;
/**
* Handles OMTenantDelete request.
*/
public class OMTenantDeleteRequest extends OMVolumeRequest {
+ public static final Logger LOG =
+ LoggerFactory.getLogger(OMTenantDeleteRequest.class);
public OMTenantDeleteRequest(OMRequest omRequest) {
super(omRequest);
}
@Override
public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
- return getOmRequest();
+
+ // Check Ozone cluster admin privilege
+ OMTenantRequestHelper.checkAdmin(ozoneManager);
+
+ final OMMetadataManager metadataManager =
ozoneManager.getMetadataManager();
+ final DeleteTenantRequest request =
getOmRequest().getDeleteTenantRequest();
+ final String tenantId = request.getTenantId();
+
+ // TODO: Check tenantId validity? Maybe not
+
+ // Check tenant existence in tenantStateTable
+ if (!metadataManager.getTenantStateTable().isExist(tenantId)) {
+ LOG.debug("tenant: {} does not exist", tenantId);
+ throw new OMException("Tenant '" + tenantId + "' does not exist",
+ TENANT_NOT_FOUND);
+ }
+
+ // Check if the tenant volume is empty (when the volume exists)
+ final OmDBTenantInfo dbTenantInfo =
+ metadataManager.getTenantStateTable().get(tenantId);
+ final String volumeName = dbTenantInfo.getAssociatedVolumeName();
+ // Note: Looks like isVolumeEmpty() returns true if volume doesn't exist
+ if (volumeName.length() > 0 && !metadataManager.isVolumeEmpty(volumeName))
{
+ LOG.debug("volume: {} is not empty", volumeName);
+ throw new OMException("Tenant volume '" + volumeName + "' is not empty."
+
+ " Volume must be emptied before the tenant can be deleted.",
+ VOLUME_NOT_EMPTY);
+ }
+
+ // Check if there are any accessIds in the tenant
+ final OMMultiTenantManager tenantManager =
+ ozoneManager.getMultiTenantManager();
+ if (!OMTenantRequestHelper.isTenantEmpty(tenantManager, tenantId)) {
+ LOG.warn("tenant: '{}' is not empty. Unable to delete the tenant",
+ tenantId);
+ throw new OMException("Tenant '" + tenantId + "' is not empty. " +
+ "All accessIds associated to this tenant must be revoked before " +
+ "the tenant can be deleted.", TENANT_NOT_EMPTY);
+ }
+
+ // TODO: TBD: Call ozoneManager.getMultiTenantManager().deleteTenant() ?
+
+ // Regenerate request with the volumeName
+ final OMRequest.Builder omRequestBuilder = getOmRequest().toBuilder()
+ .setDeleteTenantRequest(DeleteTenantRequest.newBuilder()
+ .setTenantId(tenantId))
+ .setDeleteVolumeRequest(DeleteVolumeRequest.newBuilder()
+ .setVolumeName(volumeName))
+ // TODO: Can the three lines below be ignored?
+ .setUserInfo(getUserInfo())
+ .setCmdType(getOmRequest().getCmdType())
+ .setClientId(getOmRequest().getClientId());
+
+ return omRequestBuilder.build();
}
@Override
+ public void handleRequestFailure(OzoneManager ozoneManager) {
+ super.handleRequestFailure(ozoneManager);
+ }
+
+ @Override
+ @SuppressWarnings("methodlength")
public OMClientResponse validateAndUpdateCache(
OzoneManager ozoneManager, long transactionLogIndex,
OzoneManagerDoubleBufferHelper ozoneManagerDoubleBufferHelper) {
- return null;
+ OMClientResponse omClientResponse = null;
+ final OzoneManagerProtocolProtos.OMResponse.Builder omResponse =
+ OmResponseUtil.getOMResponseBuilder(getOmRequest());
+ boolean acquiredVolumeLock = false, acquiredUserLock = false;
+ final Map<String, String> auditMap = new HashMap<>();
+ OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
+ final DeleteTenantRequest request =
getOmRequest().getDeleteTenantRequest();
+ final String tenantId = request.getTenantId();
+ // NOTE: volumeName might be a zero-length string
+ final String volumeName =
+ getOmRequest().getDeleteVolumeRequest().getVolumeName();
+
+ IOException exception = null;
+ OmVolumeArgs omVolumeArgs;
+ String volumeOwner = null;
+ // deleteVolume is true if volumeName is not empty string
+ boolean deleteVolume = volumeName.length() > 0;
+ OzoneManagerStorageProtos.PersistedUserVolumeInfo newVolumeList = null;
+
+ try {
+ if (deleteVolume) {
+ // check Acl
+ if (ozoneManager.getAclsEnabled()) {
+ checkAcls(ozoneManager, OzoneObj.ResourceType.VOLUME,
+ OzoneObj.StoreType.OZONE, IAccessAuthorizer.ACLType.DELETE,
+ volumeName, null, null);
+ }
+
+ acquiredVolumeLock = omMetadataManager.getLock().acquireWriteLock(
+ VOLUME_LOCK, volumeName);
+
+ omVolumeArgs = getVolumeInfo(omMetadataManager, volumeName);
+ // Check volume ref count
+ long volRefCount = omVolumeArgs.getRefCount();
+ if (volRefCount > 1L) {
+ LOG.warn("Volume '{}' has a greater than 1 reference count of " +
+ "'{}'", volumeName, volRefCount);
+ throw new OMException("Volume '" + volumeName + "' has a greater " +
+ "than 1 reference count of '" + volRefCount + "'. This may " +
+ "indicate the volume is in use by some other Ozone features. " +
+ "Please disable such other features before trying to delete " +
+ "the tenant again.", VOLUME_IN_USE);
+ }
+
+ volumeOwner = omVolumeArgs.getOwnerName();
+ acquiredUserLock = omMetadataManager.getLock().acquireWriteLock(
+ USER_LOCK, volumeOwner);
+
+ // Check volume emptiness, again
+ if (!omMetadataManager.isVolumeEmpty(volumeName)) {
+ LOG.debug("volume: '{}' is not empty", volumeName);
+ throw new OMException("Aborting tenant deletion. " +
+ "Volume becomes non-empty somewhere between" +
+ "preExecute and validateAndUpdateCache", VOLUME_NOT_EMPTY);
+ }
+
+ // Actual volume deletion, follows OMVolumeDeleteRequest
+ newVolumeList =
+ omMetadataManager.getUserTable().get(volumeOwner);
+ newVolumeList = delVolumeFromOwnerList(newVolumeList, volumeName,
+ volumeOwner, transactionLogIndex);
+ final String dbUserKey = omMetadataManager.getUserKey(volumeOwner);
+ omMetadataManager.getUserTable().addCacheEntry(
+ new CacheKey<>(dbUserKey),
+ new CacheValue<>(Optional.of(newVolumeList), transactionLogIndex));
+ final String dbVolumeKey = omMetadataManager.getVolumeKey(volumeName);
+ omMetadataManager.getVolumeTable().addCacheEntry(
+ new CacheKey<>(dbVolumeKey),
+ new CacheValue<>(Optional.absent(), transactionLogIndex));
+
+ // TODO: Set response dbVolumeKey?
+ }
+
+ // TODO: Should hold some tenant lock here. Just in case !deleteVolume
+// acquiredTenantLock = omMetadataManager.getLock().acquireWriteLock(
+// TENANT_LOCK, tenantId);
Review comment:
Ok, lets discuss offline and then we can update here with the result.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
