Skip to content

HDDS-10327. S3G does not work in a single-node deployment #6257

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 4 commits into from
Feb 27, 2024
Merged

HDDS-10327. S3G does not work in a single-node deployment #6257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69d0de0
HDDS-10327. S3G does not work in a single-node deployment
Feb 22, 2024
d61dd05
Add null check in getReplicationConfig
Feb 22, 2024
875edd2
Merge branch 'apache:master' into HDDS-10327
Tejaskriya Feb 22, 2024
8315dd2
Handle null replicationConfig in RpcCLient
Feb 26, 2024
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
4 changes: 2 additions & 2 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 @@ -1432,7 +1432,7 @@ public OzoneDataStreamOutput createStreamKey(
if (checkKeyNameEnabled) {
HddsClientUtils.verifyKeyName(keyName);
}
HddsClientUtils.checkNotNull(keyName, replicationConfig);
HddsClientUtils.checkNotNull(keyName);

OmKeyArgs.Builder builder = new OmKeyArgs.Builder()
.setVolumeName(volumeName)
Expand Down Expand Up @@ -1819,7 +1819,7 @@ public OmMultipartInfo initiateMultipartUpload(String volumeName,
HddsClientUtils.checkNotNull(keyName);
if (omVersion
.compareTo(OzoneManagerVersion.ERASURE_CODED_STORAGE_SUPPORT) < 0) {
if (replicationConfig.getReplicationType()
if (replicationConfig != null && replicationConfig.getReplicationType()
== HddsProtos.ReplicationType.EC) {
throw new IOException("Can not set the replication of the file to"
+ " Erasure Coded replication, as OzoneManager does not support"
Expand Down
3 changes: 2 additions & 1 deletion hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,8 @@ public Response initializeMultipartUpload(
private ReplicationConfig getReplicationConfig(OzoneBucket ozoneBucket,
String storageType) throws OS3Exception {
if (StringUtils.isEmpty(storageType)) {
storageType = S3StorageType.getDefault(ozoneConfiguration).toString();
S3StorageType defaultStorageType = S3StorageType.getDefault(ozoneConfiguration);
storageType = (defaultStorageType != null ? defaultStorageType.toString() : null);
}

ReplicationConfig clientConfiguredReplicationConfig = null;
Expand Down
4 changes: 4 additions & 0 deletions hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3StorageType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ public ReplicationType getType() {
public static S3StorageType getDefault(ConfigurationSource config) {
String replicationString = config.get(OzoneConfigKeys.OZONE_REPLICATION);
ReplicationFactor configFactor;
if (replicationString == null) {
// if no config is set then let server take decision
return null;
}
try {
configFactor = ReplicationFactor.valueOf(
Integer.parseInt(replicationString));
Expand Down