Skip to content

HDDS-6811. Bucket create message with layout type #3479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JyotinderSingh merged 2 commits into from
Jun 3, 2022
Merged

HDDS-6811. Bucket create message with layout type #3479

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7116c65
HDDS-6811. Bucket create message with layout type
tanvipenumudy Jun 2, 2022
23d8e36
Pull latest changes from apache:ozone/master into HDDS-6811
tanvipenumudy Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.BucketEncryptionKeyInfo;
import org.apache.hadoop.ozone.om.helpers.DeleteTenantState;
import org.apache.hadoop.ozone.om.helpers.OmBucketArgs;
Expand Down Expand Up @@ -625,6 +626,7 @@ public void createBucket(
Boolean.FALSE : bucketArgs.getVersioning();
StorageType storageType = bucketArgs.getStorageType() == null ?
StorageType.DEFAULT : bucketArgs.getStorageType();
BucketLayout bucketLayout = bucketArgs.getBucketLayout();
BucketEncryptionKeyInfo bek = null;
if (bucketArgs.getEncryptionKey() != null) {
bek = new BucketEncryptionKeyInfo.Builder()
Expand All @@ -648,7 +650,7 @@ public void createBucket(
.setQuotaInBytes(bucketArgs.getQuotaInBytes())
.setQuotaInNamespace(bucketArgs.getQuotaInNamespace())
.setAcls(listOfAcls.stream().distinct().collect(Collectors.toList()))
.setBucketLayout(bucketArgs.getBucketLayout())
.setBucketLayout(bucketLayout)
.setOwner(owner);

if (bek != null) {
Expand All @@ -661,9 +663,10 @@ public void createBucket(
builder.setDefaultReplicationConfig(defaultReplicationConfig);
}

LOG.info("Creating Bucket: {}/{}, with {} as owner and Versioning {} and " +
"Storage Type set to {} and Encryption set to {} ",
volumeName, bucketName, owner, isVersionEnabled,
LOG.info("Creating Bucket: {}/{}, with the Bucket Layout {}, {} as " +
"owner, Versioning {}, Storage Type set to {} and Encryption set " +
"to {} ",
volumeName, bucketName, bucketLayout, owner, isVersionEnabled,
storageType, bek != null);
ozoneManagerClient.createBucket(builder.build());
}
Expand Down