This is an automated email from the ASF dual-hosted git repository. rakeshr pushed a commit to branch HDDS-2939 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 7ca2c5ff45b8da41e608c333b3fa9d59de888435 Author: Rakesh Radhakrishnan <[email protected]> AuthorDate: Sat Mar 13 11:34:03 2021 +0530 HDDS-4973. [FSO] Missed to cleanup new FileTables in OMRequests (#2035) --- .../hadoop/ozone/om/request/file/OMFileCreateRequestV1.java | 3 +-- .../hadoop/ozone/om/request/key/OMAllocateBlockRequestV1.java | 3 +-- .../apache/hadoop/ozone/om/request/key/OMKeyCreateRequestV1.java | 3 +-- .../apache/hadoop/ozone/om/request/key/OMKeyRenameRequestV1.java | 3 +-- .../request/s3/multipart/S3InitiateMultipartUploadRequestV1.java | 3 +-- .../hadoop/ozone/om/response/file/OMFileCreateResponseV1.java | 8 ++++++++ .../hadoop/ozone/om/response/key/OMAllocateBlockResponseV1.java | 8 ++++++++ .../hadoop/ozone/om/response/key/OMKeyCreateResponseV1.java | 8 ++++++++ .../hadoop/ozone/om/response/key/OMKeyRenameResponseV1.java | 8 ++++++++ .../s3/multipart/S3InitiateMultipartUploadResponseV1.java | 8 ++++++++ 10 files changed, 45 insertions(+), 10 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestV1.java index f35c9a5..5afaf66 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestV1.java @@ -31,7 +31,6 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo; import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper; 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.OMFileCreateResponse; import org.apache.hadoop.ozone.om.response.file.OMFileCreateResponseV1; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateFileRequest; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateFileResponse; @@ -226,7 +225,7 @@ public class OMFileCreateRequestV1 extends OMFileCreateRequest { exception = ex; omMetrics.incNumCreateFileFails(); omResponse.setCmdType(Type.CreateFile); - omClientResponse = new OMFileCreateResponse(createErrorOMResponse( + omClientResponse = new OMFileCreateResponseV1(createErrorOMResponse( omResponse, exception)); } finally { addResponseToDoubleBuffer(trxnLogIndex, omClientResponse, diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestV1.java index a6a2558..a4d581c 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestV1.java @@ -34,7 +34,6 @@ import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper; import org.apache.hadoop.ozone.om.request.file.OMFileRequest; import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; import org.apache.hadoop.ozone.om.response.OMClientResponse; -import org.apache.hadoop.ozone.om.response.key.OMAllocateBlockResponse; import org.apache.hadoop.ozone.om.response.key.OMAllocateBlockResponseV1; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.AllocateBlockRequest; @@ -167,7 +166,7 @@ public class OMAllocateBlockRequestV1 extends OMAllocateBlockRequest { } catch (IOException ex) { omMetrics.incNumBlockAllocateCallFails(); exception = ex; - omClientResponse = new OMAllocateBlockResponse(createErrorOMResponse( + omClientResponse = new OMAllocateBlockResponseV1(createErrorOMResponse( omResponse, exception)); LOG.error("Allocate Block failed. Volume:{}, Bucket:{}, OpenKey:{}. " + "Exception:{}", volumeName, bucketName, openKeyName, exception); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestV1.java index a49c01e..c01c9ee 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestV1.java @@ -34,7 +34,6 @@ import org.apache.hadoop.ozone.om.request.file.OMFileRequest; import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.om.response.key.OMKeyCreateResponseV1; -import org.apache.hadoop.ozone.om.response.key.OMKeyCreateResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateKeyResponse; @@ -212,7 +211,7 @@ public class OMKeyCreateRequestV1 extends OMKeyCreateRequest { exception = ex; omMetrics.incNumKeyAllocateFails(); omResponse.setCmdType(Type.CreateKey); - omClientResponse = new OMKeyCreateResponse( + omClientResponse = new OMKeyCreateResponseV1( createErrorOMResponse(omResponse, exception)); } finally { addResponseToDoubleBuffer(trxnLogIndex, omClientResponse, diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestV1.java index ba022c5..56dcd6b 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestV1.java @@ -37,7 +37,6 @@ import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper; import org.apache.hadoop.ozone.om.request.file.OMFileRequest; import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; import org.apache.hadoop.ozone.om.response.OMClientResponse; -import org.apache.hadoop.ozone.om.response.key.OMKeyRenameResponse; import org.apache.hadoop.ozone.om.response.key.OMKeyRenameResponseV1; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.*; import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer; @@ -197,7 +196,7 @@ public class OMKeyRenameRequestV1 extends OMKeyRenameRequest { } catch (IOException ex) { result = Result.FAILURE; exception = ex; - omClientResponse = new OMKeyRenameResponse(createErrorOMResponse( + omClientResponse = new OMKeyRenameResponseV1(createErrorOMResponse( omResponse, exception)); } finally { addResponseToDoubleBuffer(trxnLogIndex, omClientResponse, diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestV1.java index d472bc1..06b2426 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestV1.java @@ -35,7 +35,6 @@ import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestV1; import org.apache.hadoop.ozone.om.request.file.OMFileRequest; import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; import org.apache.hadoop.ozone.om.response.OMClientResponse; -import org.apache.hadoop.ozone.om.response.s3.multipart.S3InitiateMultipartUploadResponse; import org.apache.hadoop.ozone.om.response.s3.multipart.S3InitiateMultipartUploadResponseV1; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.MultipartInfoInitiateRequest; @@ -217,7 +216,7 @@ public class S3InitiateMultipartUploadRequestV1 } catch (IOException ex) { result = Result.FAILURE; exception = ex; - omClientResponse = new S3InitiateMultipartUploadResponse( + omClientResponse = new S3InitiateMultipartUploadResponseV1( createErrorOMResponse(omResponse, exception)); } finally { addResponseToDoubleBuffer(transactionLogIndex, omClientResponse, diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseV1.java index 7325def..beb0c99 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseV1.java @@ -53,6 +53,14 @@ public class OMFileCreateResponseV1 extends OMFileCreateResponse { this.parentDirInfos = parentDirInfos; } + /** + * For when the request is not successful. + * For a successful request, the other constructor should be used. + */ + public OMFileCreateResponseV1(@Nonnull OMResponse omResponse) { + super(omResponse); + } + @Override public void addToDBBatch(OMMetadataManager omMetadataMgr, BatchOperation batchOp) throws IOException { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseV1.java index 138cca1..d750457 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseV1.java @@ -43,6 +43,14 @@ public class OMAllocateBlockResponseV1 extends OMAllocateBlockResponse { super(omResponse, omKeyInfo, clientID, omBucketInfo); } + /** + * For when the request is not successful. + * For a successful request, the other constructor should be used. + */ + public OMAllocateBlockResponseV1(@Nonnull OMResponse omResponse) { + super(omResponse); + } + @Override public void addToDBBatch(OMMetadataManager omMetadataManager, BatchOperation batchOperation) throws IOException { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseV1.java index 59c7edf..04237d7 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseV1.java @@ -45,4 +45,12 @@ public class OMKeyCreateResponseV1 extends OMFileCreateResponseV1 { super(omResponse, omKeyInfo, parentDirInfos, openKeySessionID, omBucketInfo); } + + /** + * For when the request is not successful. + * For a successful request, the other constructor should be used. + */ + public OMKeyCreateResponseV1(@Nonnull OMResponse omResponse) { + super(omResponse); + } } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseV1.java index 7a9b159..4437aa3 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseV1.java @@ -46,6 +46,14 @@ public class OMKeyRenameResponseV1 extends OMKeyRenameResponse { this.isRenameDirectory = isRenameDirectory; } + /** + * For when the request is not successful. + * For a successful request, the other constructor should be used. + */ + public OMKeyRenameResponseV1(@Nonnull OMResponse omResponse) { + super(omResponse); + } + @Override public void addToDBBatch(OMMetadataManager omMetadataManager, BatchOperation batchOperation) throws IOException { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseV1.java index ff3e63f..4c3f00f 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseV1.java @@ -54,6 +54,14 @@ public class S3InitiateMultipartUploadResponseV1 extends this.parentDirInfos = parentDirInfos; } + /** + * For when the request is not successful. + * For a successful request, the other constructor should be used. + */ + public S3InitiateMultipartUploadResponseV1(@Nonnull OMResponse omResponse) { + super(omResponse); + } + @Override public void addToDBBatch(OMMetadataManager omMetadataManager, BatchOperation batchOperation) throws IOException { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
