Skip to content

HDDS-6814. ozone s3 getsecret default --om-service-id #4953

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 8 commits into from
Jun 27, 2023
Merged

HDDS-6814. ozone s3 getsecret default --om-service-id #4953

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
393fdb5
HDDS-6814. Using service ID as default for HA if there is only 1 serv…
Jun 21, 2023
6d3916e
Update hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell…
Tejaskriya Jun 22, 2023
48c846a
Fixed exception message and description, added robot tests
Jun 22, 2023
3621eca
Test file changes
Jun 22, 2023
0132ab5
Removing unnecessary check for service IDs
Jun 22, 2023
6a81cb0
Improving check for service IDs
Jun 23, 2023
9a87f46
Improving check for service IDs
Jun 23, 2023
08335cd
Optimize test and remove unnecessary comments
Jun 27, 2023
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
20 changes: 15 additions & 5 deletions hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneAddress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,22 @@ public OzoneClient createClientForS3Commands(
} else {
// If om service id is not specified, consider it as a non-HA cluster.
// But before that check if serviceId is defined. If it is defined
// throw an error om service ID needs to be specified.
// and has length = 1, then take that ID as default.
// otherwise throw an error om service ID needs to be specified.
if (OmUtils.isServiceIdsDefined(conf)) {
throw new OzoneClientException("Service ID must not"
+ " be omitted when " + OZONE_OM_SERVICE_IDS_KEY + " is defined. " +
"Configured " + OZONE_OM_SERVICE_IDS_KEY + " are " +
conf.getTrimmedStringCollection(OZONE_OM_SERVICE_IDS_KEY));
Collection<String> serviceIds=conf.
getTrimmedStringCollection(OZONE_OM_SERVICE_IDS_KEY);
if (serviceIds.size() == 1) {
return OzoneClientFactory.getRpcClient(serviceIds.iterator().next(),
conf);
}
else {
throw new OzoneClientException("Service ID must not"
+ " be omitted when " + OZONE_OM_SERVICE_IDS_KEY + " is defined."
+ " Configured " + OZONE_OM_SERVICE_IDS_KEY + " are " +
conf.getTrimmedStringCollection(OZONE_OM_SERVICE_IDS_KEY));
}

}
return OzoneClientFactory.getRpcClient(conf);
}
Expand Down
4 changes: 2 additions & 2 deletions hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Handler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ public abstract class S3Handler extends Handler {

@CommandLine.Option(names = {"--om-service-id"},
required = false,
description = "OM Service ID is required to be specified for OM HA" +
" cluster")
description = "OM Service ID is preferred to be specified for OM HA" +
" cluster when there are multiple service IDs")
private String omServiceID;

public String getOmServiceID() {
Expand Down