sumitagrawl commented on code in PR #4234:
URL: https://github.com/apache/ozone/pull/4234#discussion_r1099680980
##########
hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java:
##########
@@ -472,6 +472,19 @@ String getOzonePathKey(long volumeId, long bucketId,
String getOpenFileName(long volumeId, long bucketId,
long parentObjectId, String fileName, long id);
+ /**
+ * Returns DB key name of an open file in OM metadata store. Should be
Review Comment:
Need update the comment as usecase, as prefix path till filename
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMRecoverLeaseRequest.java:
##########
@@ -0,0 +1,264 @@
+/**
+ * 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.file;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+
+import org.apache.hadoop.hdds.utils.db.Table;
+import org.apache.hadoop.hdds.utils.db.TableIterator;
+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.OMMetrics;
+import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
+import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
+import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
+import org.apache.hadoop.ozone.om.request.key.OMKeyRequest;
+import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
+import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.file.OMRecoverLeaseResponse;
+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
+ .RecoverLeaseRequest;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
+ .RecoverLeaseResponse;
+
+import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
+import org.apache.hadoop.ozone.security.acl.OzoneObj;
+import org.apache.hadoop.util.Time;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static
org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
+import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
+ .Type.RecoverLease;
+
+public class OMRecoverLeaseRequest extends OMKeyRequest {
+ private static final Logger LOG =
+ LoggerFactory.getLogger(OMRecoverLeaseRequest.class);
+
+ RecoverLeaseRequest recoverLeaseRequest;
+
+ private String volumeName;
+ private String bucketName;
+ private String keyName;
+
+ private String normalizedKeyPath;
+
+ private OMMetadataManager omMetadataManager;
+
+ public OMRecoverLeaseRequest(OMRequest omRequest) {
+ super(omRequest, BucketLayout.FILE_SYSTEM_OPTIMIZED);
+ RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
+ .getRecoverLeaseRequest();
+ Preconditions.checkNotNull(recoverLeaseRequest);
+ volumeName = recoverLeaseRequest.getVolumeName();
+ bucketName = recoverLeaseRequest.getBucketName();
+ keyName = recoverLeaseRequest.getKeyName();
+ }
+
+ @Override
+ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
+ RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
+ .getRecoverLeaseRequest();
+
+ String keyPath = recoverLeaseRequest.getKeyName();
+ normalizedKeyPath =
validateAndNormalizeKey(ozoneManager.getEnableFileSystemPaths(),
+ keyPath, getBucketLayout());
+
+ return getOmRequest().toBuilder()
+ .setRecoverLeaseRequest(
+ recoverLeaseRequest.toBuilder()
+ .setKeyName(normalizedKeyPath))
+ .build();
+ }
+
+ @Override
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
long transactionLogIndex, OzoneManagerDoubleBufferHelper
ozoneManagerDoubleBufferHelper) {
+ RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
+ .getRecoverLeaseRequest();
+ Preconditions.checkNotNull(recoverLeaseRequest);
+
+ Map<String, String> auditMap = new LinkedHashMap<>();
+ auditMap.put(OzoneConsts.VOLUME, volumeName);
+ auditMap.put(OzoneConsts.BUCKET, bucketName);
+ auditMap.put(OzoneConsts.KEY, keyName);
+
+ OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder(
+ getOmRequest());
+
+ omMetadataManager = ozoneManager.getMetadataManager();
+ OMClientResponse omClientResponse = null;
+ IOException exception = null;
+ // increment metric
+ OMMetrics omMetrics = ozoneManager.getMetrics();
+
+ boolean acquiredLock = false;
+ try {
+ // check ACL
+ checkKeyAcls(ozoneManager, volumeName, bucketName, keyName,
+ IAccessAuthorizer.ACLType.WRITE,
OzoneObj.ResourceType.KEY);
+
+ // acquire lock
+ acquiredLock =
omMetadataManager.getLock().acquireWriteLock(BUCKET_LOCK,
+ volumeName, bucketName);
+
+ validateBucketAndVolume(omMetadataManager, volumeName, bucketName);
+
+ String openKeyEntryName = doWork(ozoneManager, recoverLeaseRequest,
+ transactionLogIndex);
+
+ // Prepare response
+ boolean responseCode = true;
+
omResponse.setRecoverLeaseResponse(RecoverLeaseResponse.newBuilder()
+ .setResponse(responseCode).build())
+ .setCmdType(RecoverLease);
+ omClientResponse = new OMRecoverLeaseResponse(omResponse.build(),
+ getBucketLayout(), openKeyEntryName);
+ omMetrics.incNumRecoverLease();
+ LOG.debug("Key recovered. Volume:{}, Bucket:{}, Key:{}",
volumeName,
+ bucketName, keyName);
+ } catch (IOException ex) {
+ LOG.error("Fail for recovering lease. Volume:{}, Bucket:{},
Key:{}",
+ volumeName, bucketName, keyName, ex);
+ exception = ex;
+ omMetrics.incNumRecoverLeaseFails();
+ omResponse.setCmdType(RecoverLease);
+ omClientResponse = new OMRecoverLeaseResponse(
+ createErrorOMResponse(omResponse, ex), getBucketLayout(),
null);
+ } finally {
+ if (omClientResponse != null) {
+ omClientResponse.setFlushFuture(
+ ozoneManagerDoubleBufferHelper.add(omClientResponse,
+ transactionLogIndex));
+ }
+ if (acquiredLock) {
+ omMetadataManager.getLock().releaseWriteLock(BUCKET_LOCK,
volumeName,
+ bucketName);
+ }
+ }
+
+ // Audit Log outside the lock
+ auditLog(ozoneManager.getAuditLogger(), buildAuditMessage(
+ OMAction.RECOVER_LEASE, auditMap, exception,
+ getOmRequest().getUserInfo()));
+
+ return omClientResponse;
+ }
+
+ private String doWork(OzoneManager ozoneManager,
+ RecoverLeaseRequest recoverLeaseRequest, long transactionLogIndex)
+ throws IOException {
+
+ //String dbOzoneKey =
+ // omMetadataManager.getOzoneKey(volumeName, bucketName,
+ // keyName);
+ final long volumeId = omMetadataManager.getVolumeId(volumeName);
+ final long bucketId = omMetadataManager.getBucketId(
+ volumeName, bucketName);
+ Iterator<Path> pathComponents = Paths.get(keyName).iterator();
+ long parentID = OMFileRequest.getParentID(volumeId, bucketId,
+ pathComponents, keyName, omMetadataManager,
+ "Cannot recover file : " + keyName
+ + " as parent directory doesn't exist");
+ String fileName = OzoneFSUtils.getFileName(keyName);
+ String dbFileKey = omMetadataManager.getOzonePathKey(volumeId,
bucketId,
+ parentID, fileName);
+
+ OmKeyInfo keyInfo = getKey(dbFileKey);
+ String openKeyEntryName = getOpenFileEntryName(volumeId, bucketId,
parentID, fileName);
+
+ checkFileState(keyInfo, openKeyEntryName);
+
+ commitKey(dbFileKey, keyInfo, ozoneManager, transactionLogIndex);
+
+ removeOpenKey(openKeyEntryName, transactionLogIndex);
+
+ return openKeyEntryName;
+ }
+
+ private OmKeyInfo getKey(String dbOzoneKey) throws IOException {
+ return
omMetadataManager.getKeyTable(getBucketLayout()).get(dbOzoneKey);
+ }
+
+ private String getOpenFileEntryName(long volumeId, long bucketId,
+ long parentObjectId, String fileName) throws IOException {
+ String openFileEntryName = "";
+ String dbOpenKeyPrefix =
+ omMetadataManager.getOpenFileNamePrefix(volumeId, bucketId,
parentObjectId, fileName);
+ try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
+ iter = omMetadataManager.getOpenKeyTable(getBucketLayout())
+ .iterator(dbOpenKeyPrefix)) {
+
+ // TODO: verify that there should only be one entry for the open
key
+ while (iter.hasNext()) {
+ //OmKeyInfo keyInfo = iter.next().getValue();
Review Comment:
can remove commented code
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMRecoverLeaseRequest.java:
##########
@@ -0,0 +1,264 @@
+/**
+ * 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.file;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+
+import org.apache.hadoop.hdds.utils.db.Table;
+import org.apache.hadoop.hdds.utils.db.TableIterator;
+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.OMMetrics;
+import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
+import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
+import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
+import org.apache.hadoop.ozone.om.request.key.OMKeyRequest;
+import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
+import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.file.OMRecoverLeaseResponse;
+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
+ .RecoverLeaseRequest;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
+ .RecoverLeaseResponse;
+
+import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
+import org.apache.hadoop.ozone.security.acl.OzoneObj;
+import org.apache.hadoop.util.Time;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static
org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
+import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
+ .Type.RecoverLease;
+
+public class OMRecoverLeaseRequest extends OMKeyRequest {
+ private static final Logger LOG =
+ LoggerFactory.getLogger(OMRecoverLeaseRequest.class);
+
+ RecoverLeaseRequest recoverLeaseRequest;
+
+ private String volumeName;
+ private String bucketName;
+ private String keyName;
+
+ private String normalizedKeyPath;
+
+ private OMMetadataManager omMetadataManager;
+
+ public OMRecoverLeaseRequest(OMRequest omRequest) {
+ super(omRequest, BucketLayout.FILE_SYSTEM_OPTIMIZED);
+ RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
+ .getRecoverLeaseRequest();
+ Preconditions.checkNotNull(recoverLeaseRequest);
+ volumeName = recoverLeaseRequest.getVolumeName();
+ bucketName = recoverLeaseRequest.getBucketName();
+ keyName = recoverLeaseRequest.getKeyName();
+ }
+
+ @Override
+ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
+ RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
+ .getRecoverLeaseRequest();
+
+ String keyPath = recoverLeaseRequest.getKeyName();
+ normalizedKeyPath =
validateAndNormalizeKey(ozoneManager.getEnableFileSystemPaths(),
+ keyPath, getBucketLayout());
+
+ return getOmRequest().toBuilder()
+ .setRecoverLeaseRequest(
+ recoverLeaseRequest.toBuilder()
+ .setKeyName(normalizedKeyPath))
+ .build();
+ }
+
+ @Override
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
long transactionLogIndex, OzoneManagerDoubleBufferHelper
ozoneManagerDoubleBufferHelper) {
+ RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
+ .getRecoverLeaseRequest();
+ Preconditions.checkNotNull(recoverLeaseRequest);
+
+ Map<String, String> auditMap = new LinkedHashMap<>();
+ auditMap.put(OzoneConsts.VOLUME, volumeName);
+ auditMap.put(OzoneConsts.BUCKET, bucketName);
+ auditMap.put(OzoneConsts.KEY, keyName);
+
+ OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder(
+ getOmRequest());
+
+ omMetadataManager = ozoneManager.getMetadataManager();
+ OMClientResponse omClientResponse = null;
+ IOException exception = null;
+ // increment metric
+ OMMetrics omMetrics = ozoneManager.getMetrics();
+
+ boolean acquiredLock = false;
+ try {
+ // check ACL
+ checkKeyAcls(ozoneManager, volumeName, bucketName, keyName,
+ IAccessAuthorizer.ACLType.WRITE,
OzoneObj.ResourceType.KEY);
+
+ // acquire lock
+ acquiredLock =
omMetadataManager.getLock().acquireWriteLock(BUCKET_LOCK,
+ volumeName, bucketName);
+
+ validateBucketAndVolume(omMetadataManager, volumeName, bucketName);
+
+ String openKeyEntryName = doWork(ozoneManager, recoverLeaseRequest,
+ transactionLogIndex);
+
+ // Prepare response
+ boolean responseCode = true;
+
omResponse.setRecoverLeaseResponse(RecoverLeaseResponse.newBuilder()
+ .setResponse(responseCode).build())
+ .setCmdType(RecoverLease);
+ omClientResponse = new OMRecoverLeaseResponse(omResponse.build(),
+ getBucketLayout(), openKeyEntryName);
+ omMetrics.incNumRecoverLease();
+ LOG.debug("Key recovered. Volume:{}, Bucket:{}, Key:{}",
volumeName,
+ bucketName, keyName);
+ } catch (IOException ex) {
+ LOG.error("Fail for recovering lease. Volume:{}, Bucket:{},
Key:{}",
+ volumeName, bucketName, keyName, ex);
+ exception = ex;
+ omMetrics.incNumRecoverLeaseFails();
+ omResponse.setCmdType(RecoverLease);
+ omClientResponse = new OMRecoverLeaseResponse(
+ createErrorOMResponse(omResponse, ex), getBucketLayout(),
null);
+ } finally {
+ if (omClientResponse != null) {
+ omClientResponse.setFlushFuture(
+ ozoneManagerDoubleBufferHelper.add(omClientResponse,
+ transactionLogIndex));
+ }
+ if (acquiredLock) {
+ omMetadataManager.getLock().releaseWriteLock(BUCKET_LOCK,
volumeName,
+ bucketName);
+ }
+ }
+
+ // Audit Log outside the lock
+ auditLog(ozoneManager.getAuditLogger(), buildAuditMessage(
+ OMAction.RECOVER_LEASE, auditMap, exception,
+ getOmRequest().getUserInfo()));
+
+ return omClientResponse;
+ }
+
+ private String doWork(OzoneManager ozoneManager,
+ RecoverLeaseRequest recoverLeaseRequest, long transactionLogIndex)
+ throws IOException {
+
+ //String dbOzoneKey =
+ // omMetadataManager.getOzoneKey(volumeName, bucketName,
+ // keyName);
+ final long volumeId = omMetadataManager.getVolumeId(volumeName);
+ final long bucketId = omMetadataManager.getBucketId(
+ volumeName, bucketName);
+ Iterator<Path> pathComponents = Paths.get(keyName).iterator();
+ long parentID = OMFileRequest.getParentID(volumeId, bucketId,
+ pathComponents, keyName, omMetadataManager,
+ "Cannot recover file : " + keyName
+ + " as parent directory doesn't exist");
+ String fileName = OzoneFSUtils.getFileName(keyName);
+ String dbFileKey = omMetadataManager.getOzonePathKey(volumeId,
bucketId,
+ parentID, fileName);
+
+ OmKeyInfo keyInfo = getKey(dbFileKey);
Review Comment:
As my understanding, if a key is present in openKeyTable, entry will not be
there in keyTable, please recheck
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMRecoverLeaseResponse.java:
##########
@@ -0,0 +1,44 @@
+package org.apache.hadoop.ozone.om.response.file;
+
+import org.apache.hadoop.hdds.utils.db.BatchOperation;
+import org.apache.hadoop.ozone.OmUtils;
+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.om.response.key.OmKeyResponse;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
+ .OMResponse;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.IOException;
+
+import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.FILE_TABLE;
+import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_FILE_TABLE;
+
+@CleanupTableInfo(cleanupTables = {FILE_TABLE, OPEN_FILE_TABLE})
+public class OMRecoverLeaseResponse extends OmKeyResponse {
+
+ private String openKeyName;
+ public OMRecoverLeaseResponse(@Nonnull OMResponse omResponse,
+ BucketLayout bucketLayout, String openKeyName) {
+ super(omResponse, bucketLayout);
+ checkStatusNotOK();
+ this.openKeyName = openKeyName;
+ }
+
+ @Override
+ protected void addToDBBatch(OMMetadataManager omMetadataManager,
+ BatchOperation batchOperation) throws
IOException {
+ // Delete from OpenKey table
+ omMetadataManager.getOpenKeyTable(getBucketLayout())
Review Comment:
If some blocks occupied and present in openKeyTable, those cleanup needs to
be handled
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMRecoverLeaseRequest.java:
##########
@@ -0,0 +1,264 @@
+/**
+ * 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.file;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+
+import org.apache.hadoop.hdds.utils.db.Table;
+import org.apache.hadoop.hdds.utils.db.TableIterator;
+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.OMMetrics;
+import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
+import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
+import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
+import org.apache.hadoop.ozone.om.request.key.OMKeyRequest;
+import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
+import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.file.OMRecoverLeaseResponse;
+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
+ .RecoverLeaseRequest;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
+ .RecoverLeaseResponse;
+
+import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
+import org.apache.hadoop.ozone.security.acl.OzoneObj;
+import org.apache.hadoop.util.Time;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static
org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
+import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
+ .Type.RecoverLease;
+
+public class OMRecoverLeaseRequest extends OMKeyRequest {
+ private static final Logger LOG =
+ LoggerFactory.getLogger(OMRecoverLeaseRequest.class);
+
+ RecoverLeaseRequest recoverLeaseRequest;
+
+ private String volumeName;
+ private String bucketName;
+ private String keyName;
+
+ private String normalizedKeyPath;
+
+ private OMMetadataManager omMetadataManager;
+
+ public OMRecoverLeaseRequest(OMRequest omRequest) {
+ super(omRequest, BucketLayout.FILE_SYSTEM_OPTIMIZED);
+ RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
+ .getRecoverLeaseRequest();
+ Preconditions.checkNotNull(recoverLeaseRequest);
+ volumeName = recoverLeaseRequest.getVolumeName();
+ bucketName = recoverLeaseRequest.getBucketName();
+ keyName = recoverLeaseRequest.getKeyName();
+ }
+
+ @Override
+ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
+ RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
+ .getRecoverLeaseRequest();
+
+ String keyPath = recoverLeaseRequest.getKeyName();
+ normalizedKeyPath =
validateAndNormalizeKey(ozoneManager.getEnableFileSystemPaths(),
+ keyPath, getBucketLayout());
+
+ return getOmRequest().toBuilder()
+ .setRecoverLeaseRequest(
+ recoverLeaseRequest.toBuilder()
+ .setKeyName(normalizedKeyPath))
+ .build();
+ }
+
+ @Override
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
long transactionLogIndex, OzoneManagerDoubleBufferHelper
ozoneManagerDoubleBufferHelper) {
+ RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
+ .getRecoverLeaseRequest();
+ Preconditions.checkNotNull(recoverLeaseRequest);
+
+ Map<String, String> auditMap = new LinkedHashMap<>();
+ auditMap.put(OzoneConsts.VOLUME, volumeName);
+ auditMap.put(OzoneConsts.BUCKET, bucketName);
+ auditMap.put(OzoneConsts.KEY, keyName);
+
+ OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder(
+ getOmRequest());
+
+ omMetadataManager = ozoneManager.getMetadataManager();
+ OMClientResponse omClientResponse = null;
+ IOException exception = null;
+ // increment metric
+ OMMetrics omMetrics = ozoneManager.getMetrics();
+
+ boolean acquiredLock = false;
+ try {
+ // check ACL
+ checkKeyAcls(ozoneManager, volumeName, bucketName, keyName,
+ IAccessAuthorizer.ACLType.WRITE,
OzoneObj.ResourceType.KEY);
+
+ // acquire lock
+ acquiredLock =
omMetadataManager.getLock().acquireWriteLock(BUCKET_LOCK,
+ volumeName, bucketName);
+
+ validateBucketAndVolume(omMetadataManager, volumeName, bucketName);
+
+ String openKeyEntryName = doWork(ozoneManager, recoverLeaseRequest,
+ transactionLogIndex);
+
+ // Prepare response
+ boolean responseCode = true;
+
omResponse.setRecoverLeaseResponse(RecoverLeaseResponse.newBuilder()
+ .setResponse(responseCode).build())
+ .setCmdType(RecoverLease);
+ omClientResponse = new OMRecoverLeaseResponse(omResponse.build(),
+ getBucketLayout(), openKeyEntryName);
+ omMetrics.incNumRecoverLease();
+ LOG.debug("Key recovered. Volume:{}, Bucket:{}, Key:{}",
volumeName,
+ bucketName, keyName);
+ } catch (IOException ex) {
+ LOG.error("Fail for recovering lease. Volume:{}, Bucket:{},
Key:{}",
+ volumeName, bucketName, keyName, ex);
+ exception = ex;
+ omMetrics.incNumRecoverLeaseFails();
+ omResponse.setCmdType(RecoverLease);
+ omClientResponse = new OMRecoverLeaseResponse(
+ createErrorOMResponse(omResponse, ex), getBucketLayout(),
null);
+ } finally {
+ if (omClientResponse != null) {
+ omClientResponse.setFlushFuture(
+ ozoneManagerDoubleBufferHelper.add(omClientResponse,
+ transactionLogIndex));
+ }
+ if (acquiredLock) {
+ omMetadataManager.getLock().releaseWriteLock(BUCKET_LOCK,
volumeName,
+ bucketName);
+ }
+ }
+
+ // Audit Log outside the lock
+ auditLog(ozoneManager.getAuditLogger(), buildAuditMessage(
+ OMAction.RECOVER_LEASE, auditMap, exception,
+ getOmRequest().getUserInfo()));
+
+ return omClientResponse;
+ }
+
+ private String doWork(OzoneManager ozoneManager,
+ RecoverLeaseRequest recoverLeaseRequest, long transactionLogIndex)
+ throws IOException {
+
+ //String dbOzoneKey =
+ // omMetadataManager.getOzoneKey(volumeName, bucketName,
+ // keyName);
+ final long volumeId = omMetadataManager.getVolumeId(volumeName);
+ final long bucketId = omMetadataManager.getBucketId(
+ volumeName, bucketName);
+ Iterator<Path> pathComponents = Paths.get(keyName).iterator();
+ long parentID = OMFileRequest.getParentID(volumeId, bucketId,
+ pathComponents, keyName, omMetadataManager,
+ "Cannot recover file : " + keyName
+ + " as parent directory doesn't exist");
+ String fileName = OzoneFSUtils.getFileName(keyName);
+ String dbFileKey = omMetadataManager.getOzonePathKey(volumeId,
bucketId,
+ parentID, fileName);
+
+ OmKeyInfo keyInfo = getKey(dbFileKey);
+ String openKeyEntryName = getOpenFileEntryName(volumeId, bucketId,
parentID, fileName);
+
+ checkFileState(keyInfo, openKeyEntryName);
+
+ commitKey(dbFileKey, keyInfo, ozoneManager, transactionLogIndex);
+
+ removeOpenKey(openKeyEntryName, transactionLogIndex);
+
+ return openKeyEntryName;
+ }
+
+ private OmKeyInfo getKey(String dbOzoneKey) throws IOException {
+ return
omMetadataManager.getKeyTable(getBucketLayout()).get(dbOzoneKey);
+ }
+
+ private String getOpenFileEntryName(long volumeId, long bucketId,
+ long parentObjectId, String fileName) throws IOException {
+ String openFileEntryName = "";
+ String dbOpenKeyPrefix =
+ omMetadataManager.getOpenFileNamePrefix(volumeId, bucketId,
parentObjectId, fileName);
+ try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
+ iter = omMetadataManager.getOpenKeyTable(getBucketLayout())
+ .iterator(dbOpenKeyPrefix)) {
+
+ // TODO: verify that there should only be one entry for the open
key
Review Comment:
I think multiple file can be uploaded parallel and commit is successful
whoever commits first, check this part.
Also cleanup is done for any client, Do any waiting period is required? or
cleanup immediately is fine as per HDFS behavior ?
##########
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java:
##########
@@ -321,6 +321,7 @@ public static boolean isReadOnly(
case TenantAssignAdmin:
case TenantRevokeAdmin:
case SetRangerServiceVersion:
+ case RecoverLease:
Review Comment:
Ozone do not have any acquireLease kind of interface, this name will be
confusing wrt ozone. It can be RecoverOpenKey.
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMRecoverLeaseRequest.java:
##########
@@ -0,0 +1,264 @@
+/**
+ * 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.file;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+
+import org.apache.hadoop.hdds.utils.db.Table;
+import org.apache.hadoop.hdds.utils.db.TableIterator;
+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.OMMetrics;
+import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
+import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
+import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
+import org.apache.hadoop.ozone.om.request.key.OMKeyRequest;
+import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
+import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.file.OMRecoverLeaseResponse;
+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
+ .RecoverLeaseRequest;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
+ .RecoverLeaseResponse;
+
+import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
+import org.apache.hadoop.ozone.security.acl.OzoneObj;
+import org.apache.hadoop.util.Time;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static
org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
+import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
+ .Type.RecoverLease;
+
+public class OMRecoverLeaseRequest extends OMKeyRequest {
+ private static final Logger LOG =
+ LoggerFactory.getLogger(OMRecoverLeaseRequest.class);
+
+ RecoverLeaseRequest recoverLeaseRequest;
+
+ private String volumeName;
+ private String bucketName;
+ private String keyName;
+
+ private String normalizedKeyPath;
+
+ private OMMetadataManager omMetadataManager;
+
+ public OMRecoverLeaseRequest(OMRequest omRequest) {
+ super(omRequest, BucketLayout.FILE_SYSTEM_OPTIMIZED);
+ RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
+ .getRecoverLeaseRequest();
+ Preconditions.checkNotNull(recoverLeaseRequest);
+ volumeName = recoverLeaseRequest.getVolumeName();
+ bucketName = recoverLeaseRequest.getBucketName();
+ keyName = recoverLeaseRequest.getKeyName();
+ }
+
+ @Override
+ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
+ RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
+ .getRecoverLeaseRequest();
+
+ String keyPath = recoverLeaseRequest.getKeyName();
+ normalizedKeyPath =
validateAndNormalizeKey(ozoneManager.getEnableFileSystemPaths(),
+ keyPath, getBucketLayout());
+
+ return getOmRequest().toBuilder()
+ .setRecoverLeaseRequest(
+ recoverLeaseRequest.toBuilder()
+ .setKeyName(normalizedKeyPath))
+ .build();
+ }
+
+ @Override
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
long transactionLogIndex, OzoneManagerDoubleBufferHelper
ozoneManagerDoubleBufferHelper) {
+ RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
+ .getRecoverLeaseRequest();
+ Preconditions.checkNotNull(recoverLeaseRequest);
+
+ Map<String, String> auditMap = new LinkedHashMap<>();
+ auditMap.put(OzoneConsts.VOLUME, volumeName);
+ auditMap.put(OzoneConsts.BUCKET, bucketName);
+ auditMap.put(OzoneConsts.KEY, keyName);
+
+ OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder(
+ getOmRequest());
+
+ omMetadataManager = ozoneManager.getMetadataManager();
+ OMClientResponse omClientResponse = null;
+ IOException exception = null;
+ // increment metric
+ OMMetrics omMetrics = ozoneManager.getMetrics();
+
+ boolean acquiredLock = false;
+ try {
+ // check ACL
+ checkKeyAcls(ozoneManager, volumeName, bucketName, keyName,
+ IAccessAuthorizer.ACLType.WRITE,
OzoneObj.ResourceType.KEY);
+
+ // acquire lock
+ acquiredLock =
omMetadataManager.getLock().acquireWriteLock(BUCKET_LOCK,
+ volumeName, bucketName);
+
+ validateBucketAndVolume(omMetadataManager, volumeName, bucketName);
+
+ String openKeyEntryName = doWork(ozoneManager, recoverLeaseRequest,
+ transactionLogIndex);
+
+ // Prepare response
+ boolean responseCode = true;
+
omResponse.setRecoverLeaseResponse(RecoverLeaseResponse.newBuilder()
+ .setResponse(responseCode).build())
+ .setCmdType(RecoverLease);
+ omClientResponse = new OMRecoverLeaseResponse(omResponse.build(),
+ getBucketLayout(), openKeyEntryName);
+ omMetrics.incNumRecoverLease();
+ LOG.debug("Key recovered. Volume:{}, Bucket:{}, Key:{}",
volumeName,
+ bucketName, keyName);
+ } catch (IOException ex) {
+ LOG.error("Fail for recovering lease. Volume:{}, Bucket:{},
Key:{}",
+ volumeName, bucketName, keyName, ex);
+ exception = ex;
+ omMetrics.incNumRecoverLeaseFails();
+ omResponse.setCmdType(RecoverLease);
+ omClientResponse = new OMRecoverLeaseResponse(
+ createErrorOMResponse(omResponse, ex), getBucketLayout(),
null);
+ } finally {
+ if (omClientResponse != null) {
+ omClientResponse.setFlushFuture(
+ ozoneManagerDoubleBufferHelper.add(omClientResponse,
+ transactionLogIndex));
+ }
+ if (acquiredLock) {
+ omMetadataManager.getLock().releaseWriteLock(BUCKET_LOCK,
volumeName,
+ bucketName);
+ }
+ }
+
+ // Audit Log outside the lock
+ auditLog(ozoneManager.getAuditLogger(), buildAuditMessage(
+ OMAction.RECOVER_LEASE, auditMap, exception,
+ getOmRequest().getUserInfo()));
+
+ return omClientResponse;
+ }
+
+ private String doWork(OzoneManager ozoneManager,
+ RecoverLeaseRequest recoverLeaseRequest, long transactionLogIndex)
+ throws IOException {
+
+ //String dbOzoneKey =
+ // omMetadataManager.getOzoneKey(volumeName, bucketName,
+ // keyName);
+ final long volumeId = omMetadataManager.getVolumeId(volumeName);
+ final long bucketId = omMetadataManager.getBucketId(
+ volumeName, bucketName);
+ Iterator<Path> pathComponents = Paths.get(keyName).iterator();
+ long parentID = OMFileRequest.getParentID(volumeId, bucketId,
+ pathComponents, keyName, omMetadataManager,
+ "Cannot recover file : " + keyName
+ + " as parent directory doesn't exist");
+ String fileName = OzoneFSUtils.getFileName(keyName);
+ String dbFileKey = omMetadataManager.getOzonePathKey(volumeId,
bucketId,
+ parentID, fileName);
+
+ OmKeyInfo keyInfo = getKey(dbFileKey);
+ String openKeyEntryName = getOpenFileEntryName(volumeId, bucketId,
parentID, fileName);
+
+ checkFileState(keyInfo, openKeyEntryName);
+
+ commitKey(dbFileKey, keyInfo, ozoneManager, transactionLogIndex);
Review Comment:
I am not finding usages of adding keyInfo to cache as its cleaned up in flush
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java:
##########
@@ -216,7 +218,17 @@ public static OMClientRequest
createClientRequest(OMRequest omRequest,
omRequest.getDeleteOpenKeysRequest().getBucketLayout());
}
return new OMOpenKeysDeleteRequest(omRequest, bktLayout);
-
+ case RecoverLease: {
+ volumeName = omRequest.getRecoverLeaseRequest().getVolumeName();
+ bucketName = omRequest.getRecoverLeaseRequest().getBucketName();
+ bucketLayout =
+ getBucketLayout(ozoneManager.getMetadataManager(), volumeName,
bucketName);
+ if (bucketLayout != BucketLayout.FILE_SYSTEM_OPTIMIZED) {
Review Comment:
ozone also have object store, check if included as part of this to cleanup
openKeyTable
--
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]
