Skip to content

HDDS-4010. S3G startup fails when multiple service ids are configured. #2976

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
bharatviswa504 merged 1 commit into from
Jan 11, 2022
Merged

HDDS-4010. S3G startup fails when multiple service ids are configured. #2976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/OzoneClientProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.om.protocol.S3Auth;
Expand Down Expand Up @@ -62,9 +63,6 @@ public class OzoneClientProducer {
@Inject
private OzoneConfiguration ozoneConfiguration;

@Inject
private String omServiceID;

@Context
private ContainerRequestContext context;

Expand Down Expand Up @@ -115,6 +113,7 @@ OzoneClient createOzoneClient() throws IOException {
// Set the expected OM version if not set via config.
ozoneConfiguration.setIfUnset(OZONE_OM_CLIENT_PROTOCOL_VERSION_KEY,
OZONE_OM_CLIENT_PROTOCOL_VERSION);
String omServiceID = OmUtils.getOzoneManagerServiceId(ozoneConfiguration);
if (omServiceID == null) {
return OzoneClientFactory.getRpcClient(ozoneConfiguration);
} else {
Expand Down
78 changes: 0 additions & 78 deletions hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/OzoneServiceProvider.java
View file
Open in desktop

This file was deleted.

33 changes: 33 additions & 0 deletions hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestOzoneClientProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,39 @@ public void testGetClientFailure() {
}
}

@Test
public void testGetClientFailureWithMultipleServiceIds() {
try {
OzoneConfiguration configuration = new OzoneConfiguration();
configuration.set(OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY, "ozone1,ozone2");
producer.setOzoneConfiguration(configuration);
producer.createClient();
fail("testGetClientFailureWithMultipleServiceIds");
} catch (Exception ex) {
Assert.assertTrue(ex instanceof IOException);
Assert.assertTrue(ex.getMessage().contains(
"More than 1 OzoneManager ServiceID"));
}
}

@Test
public void testGetClientFailureWithMultipleServiceIdsAndInternalServiceId() {
try {
OzoneConfiguration configuration = new OzoneConfiguration();
configuration.set(OMConfigKeys.OZONE_OM_INTERNAL_SERVICE_ID, "ozone1");
configuration.set(OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY, "ozone1,ozone2");
producer.setOzoneConfiguration(configuration);
producer.createClient();
fail("testGetClientFailureWithMultipleServiceIdsAndInternalServiceId");
} catch (Exception ex) {
Assert.assertTrue(ex instanceof IOException);
// Still test will fail, as config is not complete. But it should pass
// the service id check.
Assert.assertFalse(ex.getMessage().contains(
"More than 1 OzoneManager ServiceID"));
}
}

private void setupContext() throws Exception {
headerMap.putSingle(AUTHORIZATION_HEADER, authHeader);
headerMap.putSingle(CONTENT_MD5, contentMd5);
Expand Down