This is an automated email from the ASF dual-hosted git repository.
siyao pushed a commit to branch HDDS-4944
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-4944 by this push:
new c5bd28610a HDDS-6575. [Multi-Tenant] Clean up unused
tenantDefaultPolicyName field in CreateTenantRequest protobuf message (#3300)
c5bd28610a is described below
commit c5bd28610af835d1df8099a913469c4cd7e3faf8
Author: Siyao Meng <[email protected]>
AuthorDate: Wed Apr 13 09:31:50 2022 -0700
HDDS-6575. [Multi-Tenant] Clean up unused tenantDefaultPolicyName field in
CreateTenantRequest protobuf message (#3300)
---
.../interface-client/src/main/proto/OmClientProtocol.proto | 3 +--
.../ozone/om/request/s3/tenant/OMTenantCreateRequest.java | 11 -----------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git
a/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
b/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
index 7f9e792f4c..9c3578cd5d 100644
--- a/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
+++ b/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
@@ -1482,8 +1482,7 @@ message RevokeS3SecretRequest {
message CreateTenantRequest {
optional string tenantId = 1; // Tenant name
- optional string tenantDefaultPolicyName = 2;
- optional string volumeName = 3;
+ optional string volumeName = 2;
}
message DeleteTenantRequest {
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantCreateRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantCreateRequest.java
index 14e03ead73..f3175f2bbd 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantCreateRequest.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.OmDBTenantState;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
-import org.apache.hadoop.ozone.om.multitenant.AccessPolicy;
import org.apache.hadoop.ozone.om.multitenant.Tenant;
import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
@@ -57,7 +56,6 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import java.util.stream.Collectors;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.TENANT_ALREADY_EXISTS;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.VOLUME_ALREADY_EXISTS;
@@ -170,16 +168,9 @@ public class OMTenantCreateRequest extends OMVolumeRequest
{
tenantInContext = ozoneManager.getMultiTenantManager()
.createTenantAccessInAuthorizer(tenantId);
- // Get the tenant default policy, pass this along
- final String tenantDefaultPolicies = tenantInContext
- .getTenantAccessPolicies()
- .stream().map(AccessPolicy::getPolicyID)
- .collect(Collectors.joining(","));
-
final OMRequest.Builder omRequestBuilder = getOmRequest().toBuilder()
.setCreateTenantRequest(
CreateTenantRequest.newBuilder()
- .setTenantDefaultPolicyName(tenantDefaultPolicies)
.setTenantId(tenantId)
.setVolumeName(volumeName))
.setCreateVolumeRequest(
@@ -236,8 +227,6 @@ public class OMTenantCreateRequest extends OMVolumeRequest {
final String dbVolumeKey = omMetadataManager.getVolumeKey(volumeName);
IOException exception = null;
- final String tenantDefaultPolicies = request.getTenantDefaultPolicyName();
-
try {
// Check ACL: requires volume CREATE permission.
if (ozoneManager.getAclsEnabled()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
