This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 9489d7e9f3 HDDS-6796. Extract method for building OMRequest in
TrashOzoneFileSystem (#6048)
9489d7e9f3 is described below
commit 9489d7e9f38baaf630ec1ce0f3ac5881af663fab
Author: Will Xiao <[email protected]>
AuthorDate: Mon Jan 22 20:55:26 2024 +0800
HDDS-6796. Extract method for building OMRequest in TrashOzoneFileSystem
(#6048)
---
.../hadoop/ozone/om/TrashOzoneFileSystem.java | 31 +++++++++++-----------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashOzoneFileSystem.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashOzoneFileSystem.java
index 5ada613734..6e1c9da34c 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashOzoneFileSystem.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashOzoneFileSystem.java
@@ -460,6 +460,18 @@ public class TrashOzoneFileSystem extends FileSystem {
}
}
+ /**
+ * Returns a OMRequest builder with specified type.
+ * @param cmdType type of the request
+ */
+ private OzoneManagerProtocolProtos.OMRequest.Builder
+ createOMRequest(OzoneManagerProtocolProtos.Type cmdType) throws
IOException {
+ return OzoneManagerProtocolProtos.OMRequest.newBuilder()
+ .setClientId(CLIENT_ID.toString())
+ .setVersion(ClientVersion.CURRENT_VERSION)
+ .setUserInfo(getUserInfo())
+ .setCmdType(cmdType);
+ }
private OzoneManagerProtocolProtos.OMRequest
getRenameKeyRequest(
@@ -483,12 +495,8 @@ public class TrashOzoneFileSystem extends FileSystem {
OzoneManagerProtocolProtos.OMRequest omRequest =
null;
try {
- omRequest = OzoneManagerProtocolProtos.OMRequest.newBuilder()
- .setClientId(CLIENT_ID.toString())
- .setVersion(ClientVersion.CURRENT_VERSION)
- .setUserInfo(getUserInfo())
+ omRequest = createOMRequest(OzoneManagerProtocolProtos.Type.RenameKey)
.setRenameKeyRequest(renameKeyRequest)
- .setCmdType(OzoneManagerProtocolProtos.Type.RenameKey)
.build();
} catch (IOException e) {
LOG.error("Couldn't get userinfo", e);
@@ -549,13 +557,8 @@ public class TrashOzoneFileSystem extends FileSystem {
OzoneManagerProtocolProtos.OMRequest omRequest =
null;
try {
- omRequest =
- OzoneManagerProtocolProtos.OMRequest.newBuilder()
- .setClientId(CLIENT_ID.toString())
- .setVersion(ClientVersion.CURRENT_VERSION)
- .setUserInfo(getUserInfo())
+ omRequest = createOMRequest(OzoneManagerProtocolProtos.Type.DeleteKey)
.setDeleteKeyRequest(deleteKeyRequest)
- .setCmdType(OzoneManagerProtocolProtos.Type.DeleteKey)
.build();
} catch (IOException e) {
LOG.error("Couldn't get userinfo", e);
@@ -619,12 +622,8 @@ public class TrashOzoneFileSystem extends FileSystem {
OzoneManagerProtocolProtos.OMRequest omRequest =
null;
try {
- omRequest = OzoneManagerProtocolProtos.OMRequest.newBuilder()
- .setClientId(CLIENT_ID.toString())
- .setVersion(ClientVersion.CURRENT_VERSION)
- .setUserInfo(getUserInfo())
+ omRequest = createOMRequest(OzoneManagerProtocolProtos.Type.DeleteKeys)
.setDeleteKeysRequest(deleteKeysRequest)
- .setCmdType(OzoneManagerProtocolProtos.Type.DeleteKeys)
.build();
} catch (IOException e) {
LOG.error("Couldn't get userinfo", e);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
