Skip to content

HDDS-6879. Bucket layout as null on default layout type #3561

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
adoroszlai merged 2 commits into from
Jun 30, 2022
Merged

HDDS-6879. Bucket layout as null on default layout type #3561

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3491c95
HDDS-6879. Bucket layout as null on default layout type
tanvipenumudy Jun 27, 2022
1e23924
address review comments
tanvipenumudy Jun 28, 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
23 changes: 18 additions & 5 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 @@ -202,6 +202,7 @@ public class RpcClient implements ClientProtocol {
private final BlockInputStreamFactory blockInputStreamFactory;
private final OzoneManagerVersion omVersion;
private volatile ExecutorService ecReconstructExecutor;
private final String defaultBucketLayout;

/**
* Creates RpcClient instance with the given configuration.
Expand Down Expand Up @@ -308,6 +309,9 @@ public RpcClient(ConfigurationSource conf, String omServiceId)
getLatestVersionLocation = conf.getBoolean(
OzoneConfigKeys.OZONE_CLIENT_KEY_LATEST_VERSION_LOCATION,
OzoneConfigKeys.OZONE_CLIENT_KEY_LATEST_VERSION_LOCATION_DEFAULT);
defaultBucketLayout = conf.getTrimmed(
OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT_DEFAULT);
Comment thread
tanvipenumudy marked this conversation as resolved.
Outdated

long keyProviderCacheExpiryMs = conf.getTimeDuration(
OZONE_CLIENT_KEY_PROVIDER_CACHE_EXPIRY,
Expand Down Expand Up @@ -663,11 +667,20 @@ public void createBucket(
builder.setDefaultReplicationConfig(defaultReplicationConfig);
}

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);
if (bucketLayout != null) {
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);
} else {
LOG.info("Creating Bucket: {}/{}, with the Bucket Layout {} - set to" +
"OM server default using the configuration: " +
"ozone.default.bucket.layout, {} as owner, Versioning {}, " +
"Storage Type set to {} and Encryption set to {} ",
volumeName, bucketName, defaultBucketLayout, owner, isVersionEnabled,
storageType, bek != null);
}
Comment thread
tanvipenumudy marked this conversation as resolved.
Outdated
ozoneManagerClient.createBucket(builder.build());
}

Expand Down