[
https://issues.apache.org/jira/browse/HDDS-6612?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Siyao Meng updated HDDS-6612:
-----------------------------
Description:
{code:diff}
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 b425ea4424..1e7231d8fd 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
@@ -190,6 +190,7 @@ public static OMClientRequest createClientRequest(OMRequest
omRequest,
case PurgePaths:
return new OMPathsPurgeRequestWithFSO(omRequest);
case CreateTenant:
+ ozoneManager.getConfiguration().getBoolean("OZONE_MT_ENABLED", false);
// TODO
return new OMTenantCreateRequest(omRequest);
case DeleteTenant:
return new OMTenantDeleteRequest(omRequest);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignAdminRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignAdminRequest.java
index 8a3cd7e108..b1605c5c1e 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignAdminRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignAdminRequest.java
@@ -74,6 +74,8 @@ public OMTenantAssignAdminRequest(OMRequest omRequest) {
@Override
@DisallowedUntilLayoutVersion(MULTITENANCY_SCHEMA)
public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
+ super.preExecute(ozoneManager);
+
final TenantAssignAdminRequest request =
getOmRequest().getTenantAssignAdminRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
index 5ab4a3b051..d0739c1441 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
@@ -235,6 +235,7 @@ public OMResponse handleReadRequest(OMRequest request) {
responseBuilder.setGetS3VolumeContextResponse(s3VolumeContextResponse);
break;
case TenantGetUserInfo:
+ impl.getConfiguration().getBoolean("OZONE_MT_ENABLED", false); //
TODO
TenantGetUserInfoResponse getUserInfoResponse = tenantGetUserInfo(
request.getTenantGetUserInfoRequest());
responseBuilder.setTenantGetUserInfoResponse(getUserInfoResponse);
{code}
> Add config key to enable or disable Multi-Tenancy feature
> ---------------------------------------------------------
>
> Key: HDDS-6612
> URL: https://issues.apache.org/jira/browse/HDDS-6612
> Project: Apache Ozone
> Issue Type: Sub-task
> Reporter: Siyao Meng
> Priority: Major
>
> {code:diff}
> 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 b425ea4424..1e7231d8fd 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
> @@ -190,6 +190,7 @@ public static OMClientRequest
> createClientRequest(OMRequest omRequest,
> case PurgePaths:
> return new OMPathsPurgeRequestWithFSO(omRequest);
> case CreateTenant:
> + ozoneManager.getConfiguration().getBoolean("OZONE_MT_ENABLED", false);
> // TODO
> return new OMTenantCreateRequest(omRequest);
> case DeleteTenant:
> return new OMTenantDeleteRequest(omRequest);
> diff --git
> a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignAdminRequest.java
>
> b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignAdminRequest.java
> index 8a3cd7e108..b1605c5c1e 100644
> ---
> a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignAdminRequest.java
> +++
> b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignAdminRequest.java
> @@ -74,6 +74,8 @@ public OMTenantAssignAdminRequest(OMRequest omRequest) {
> @Override
> @DisallowedUntilLayoutVersion(MULTITENANCY_SCHEMA)
> public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
> + super.preExecute(ozoneManager);
> +
> final TenantAssignAdminRequest request =
> getOmRequest().getTenantAssignAdminRequest();
>
> diff --git
> a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
>
> b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
> index 5ab4a3b051..d0739c1441 100644
> ---
> a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
> +++
> b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
> @@ -235,6 +235,7 @@ public OMResponse handleReadRequest(OMRequest request) {
>
> responseBuilder.setGetS3VolumeContextResponse(s3VolumeContextResponse);
> break;
> case TenantGetUserInfo:
> + impl.getConfiguration().getBoolean("OZONE_MT_ENABLED", false); //
> TODO
> TenantGetUserInfoResponse getUserInfoResponse = tenantGetUserInfo(
> request.getTenantGetUserInfoRequest());
> responseBuilder.setTenantGetUserInfoResponse(getUserInfoResponse);
> {code}
--
This message was sent by Atlassian Jira
(v8.20.7#820007)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
