anuragp010 commented on code in PR #11867:
URL: https://github.com/apache/ozone/pull/11867#discussion_r4454885188
##########
hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestS3StorageClass.java:
##########
@@ -329,6 +330,125 @@ void testForwardRatisReplication() {
resolver.toSpec(S3_STORAGE_CLASS_REDUCED_REDUNDANCY), null, null));
}
+ @Test
+ void testStandardClientOverrideDisabledByDefault() {
+ OzoneConfiguration conf = new OzoneConfiguration();
+ for (String setting : Arrays.asList(null, "false")) {
+ if (setting != null) {
+ conf.set(OZONE_S3G_STANDARD_STORAGE_CLASS_USE_CLIENT_DEFAULT_KEY,
setting);
+ }
+ S3StorageClassResolver resolver = new S3StorageClassResolver(conf);
+ for (ReplicationConfig clientConfig : REPLICATIONS) {
+ assertEquals(RATIS_THREE,
+ resolver.resolveReplicationConfig(S3_STORAGE_CLASS_STANDARD,
"INVALID", clientConfig, EC_6_3));
+ }
+ }
+ }
+
+ @Test
+ void testStandardUsesCompleteClientReplicationWhenEnabled() {
+ OzoneConfiguration conf = new OzoneConfiguration();
+ conf.setBoolean(OZONE_S3G_STANDARD_STORAGE_CLASS_USE_CLIENT_DEFAULT_KEY,
true);
+ S3StorageClassResolver resolver = new S3StorageClassResolver(conf);
+ for (ReplicationConfig clientConfig : REPLICATIONS) {
+ assertEquals(clientConfig,
+ resolver.resolveReplicationConfig(S3_STORAGE_CLASS_STANDARD, null,
clientConfig, EC_3_2));
+ }
+
+ ReplicationConfig clientConfig = new ECReplicationConfig("rs-6-3-512k");
+ for (String header : Arrays.asList("STANDARD", " STANDARD ")) {
+ for (String layout : Arrays.asList(null, "", "rs-3-2-1024k", "INVALID"))
{
+ assertEquals(clientConfig, resolver.resolveReplicationConfig(header,
layout, clientConfig, EC_3_2));
+ }
+ }
+ }
+
+ @Test
+ void testStandardWithoutClientReplicationStillUsesRatisThree() {
+ OzoneConfiguration conf = new OzoneConfiguration();
+ conf.setBoolean(OZONE_S3G_STANDARD_STORAGE_CLASS_USE_CLIENT_DEFAULT_KEY,
true);
+ S3StorageClassResolver resolver = new S3StorageClassResolver(conf);
+ for (ReplicationConfig bucketConfig : Arrays.asList(null, RATIS_ONE,
EC_6_3)) {
+ assertEquals(RATIS_THREE,
+ resolver.resolveReplicationConfig(S3_STORAGE_CLASS_STANDARD,
"rs-6-3-512k", null, bucketConfig));
+ }
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {false, true})
+ void testClientOverrideDoesNotChangeOtherClasses(boolean enabled) {
+ OzoneConfiguration conf = new OzoneConfiguration();
+ conf.setBoolean(OZONE_S3G_STANDARD_STORAGE_CLASS_USE_CLIENT_DEFAULT_KEY,
enabled);
+ S3StorageClassResolver resolver = new S3StorageClassResolver(conf);
+ assertEquals(RATIS_ONE,
+ resolver.resolveReplicationConfig(S3_STORAGE_CLASS_REDUCED_REDUNDANCY,
"INVALID", EC_6_3, EC_3_2));
+ assertEquals(RATIS_THREE,
+ resolver.resolveReplicationConfig(S3_STORAGE_CLASS_GLACIER, "INVALID",
RATIS_ONE, EC_6_3));
+ for (String storageClass : Arrays.asList(S3_STORAGE_CLASS_STANDARD_IA,
S3_STORAGE_CLASS_DEEP_ARCHIVE)) {
+ assertEquals(new ECReplicationConfig("rs-6-3-512k"),
+ resolver.resolveReplicationConfig(storageClass, "rs-6-3-512k",
RATIS_ONE, EC_3_2));
+ assertEquals(EC_6_3, resolver.resolveReplicationConfig(storageClass,
null, RATIS_ONE, EC_6_3));
+ assertEquals(EC_6_3, resolver.resolveReplicationConfig(storageClass, "",
EC_3_2, EC_6_3));
+ assertEquals(EC_3_2, resolver.resolveReplicationConfig(storageClass,
null, EC_6_3, RATIS_ONE));
+ assertEquals(EC_3_2, resolver.resolveReplicationConfig(storageClass,
null, EC_6_3, null));
+ }
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {false, true})
+ void testMissingClassUsesClientThenBucketReplication(boolean enabled) {
+ OzoneConfiguration conf = new OzoneConfiguration();
+ conf.setBoolean(OZONE_S3G_STANDARD_STORAGE_CLASS_USE_CLIENT_DEFAULT_KEY,
enabled);
+ S3StorageClassResolver resolver = new S3StorageClassResolver(conf);
+ for (String header : Arrays.asList(null, "")) {
+ for (String layout : Arrays.asList(null, "INVALID")) {
+ assertEquals(RATIS_ONE, resolver.resolveReplicationConfig(header,
layout, RATIS_ONE, EC_6_3));
Review Comment:
nit: Can we use assertThat where possible?
[HDDS-9951](https://issues.apache.org/jira/browse/HDDS-9951)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
