adoroszlai commented on code in PR #3297:
URL: https://github.com/apache/ozone/pull/3297#discussion_r857300351
##########
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java:
##########
@@ -65,6 +64,8 @@ public void initializeMemberVariables() {
xmlPrefixToSkipCompare.add("ipc.client.rpc-timeout.ms");
xmlPropsToSkipCompare.add("ozone.om.leader.election.minimum.timeout" +
".duration"); // Deprecated config
+ xmlPrefixToSkipCompare.add("ozone.s3g");
+ configurationPrefixToSkipCompare.add("ozone.s3g");
Review Comment:
@neils-dev Sorry, I missed this.
> I believe that the check for properties to be in sync (xml and config
keys) is done elsewhere as well for the s3 gateway
I don't think there is such a check elsewhere. `ozone-default.xml` defines
properties for several components. The test needs to have access to all Java
config key definitions, that's why it's in the `ozone-integration-test` module.
A separate test would be possible only if config keys were defined in a
separate XML file.
However, I don't see any problem with restoring the dependency and adding
back `S3GatewayConfigKeys` in the test. Ozone builds fine with the patch
below. Can you please let me know why the dependency would need to be removed?
```diff
diff --git hadoop-ozone/integration-test/pom.xml
hadoop-ozone/integration-test/pom.xml
index d3faa6b52..cea5163fc 100644
--- hadoop-ozone/integration-test/pom.xml
+++ hadoop-ozone/integration-test/pom.xml
@@ -53,6 +53,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-s3gateway</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-csi</artifactId>
diff --git
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
index 4d8151f78..3b9d3df97 100644
---
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
+++
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
@@ -26,6 +26,7 @@
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.ozone.recon.ReconServerConfigKeys;
+import org.apache.hadoop.ozone.s3.S3GatewayConfigKeys;
import java.util.Arrays;
import org.junit.Rule;
@@ -49,6 +50,7 @@ public void initializeMemberVariables() {
new Class[] {OzoneConfigKeys.class, ScmConfigKeys.class,
OMConfigKeys.class, HddsConfigKeys.class,
ReconConfigKeys.class, ReconServerConfigKeys.class,
+ S3GatewayConfigKeys.class,
SCMHTTPServerConfig.class,
SCMHTTPServerConfig.ConfigStrings.class,
ScmConfig.ConfigStrings.class
@@ -64,8 +66,6 @@ public void initializeMemberVariables() {
xmlPrefixToSkipCompare.add("ipc.client.rpc-timeout.ms");
xmlPropsToSkipCompare.add("ozone.om.leader.election.minimum.timeout" +
".duration"); // Deprecated config
- xmlPrefixToSkipCompare.add("ozone.s3g");
- configurationPrefixToSkipCompare.add("ozone.s3g");
configurationPropsToSkipCompare
.add(ScmConfig.ConfigStrings.HDDS_SCM_INIT_DEFAULT_LAYOUT_VERSION);
// Currently replication and type configs moved to server side.
```
--
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]
