This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 54548aa768 HDDS-10327. S3G does not work in a single-node deployment
(#6257)
54548aa768 is described below
commit 54548aa76836dc9acfdb5fb62f0b0e8bb169b1b4
Author: Tejaskriya <[email protected]>
AuthorDate: Tue Feb 27 23:09:13 2024 +0530
HDDS-10327. S3G does not work in a single-node deployment (#6257)
---
.../src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java | 4 ++--
.../main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java | 3 ++-
.../src/main/java/org/apache/hadoop/ozone/s3/util/S3StorageType.java | 4 ++++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
index 74b22e7ca4..bcb08f1d91 100644
---
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
+++
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
@@ -1432,7 +1432,7 @@ public class RpcClient implements ClientProtocol {
if (checkKeyNameEnabled) {
HddsClientUtils.verifyKeyName(keyName);
}
- HddsClientUtils.checkNotNull(keyName, replicationConfig);
+ HddsClientUtils.checkNotNull(keyName);
OmKeyArgs.Builder builder = new OmKeyArgs.Builder()
.setVolumeName(volumeName)
@@ -1819,7 +1819,7 @@ public class RpcClient implements ClientProtocol {
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"
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java
index 0514125abd..1d3850b12a 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java
@@ -772,7 +772,8 @@ public class ObjectEndpoint extends EndpointBase {
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;
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3StorageType.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3StorageType.java
index ae42e812fb..9eb88989a3 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3StorageType.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3StorageType.java
@@ -62,6 +62,10 @@ public enum S3StorageType {
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));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
