Skip to content

HDDS-15108. Remove duplicate keys from ozone-default.xml#10121

Merged
sarvekshayr merged 3 commits intoapache:masterfrom
adoroszlai:HDDS-15108
Apr 26, 2026
Merged

HDDS-15108. Remove duplicate keys from ozone-default.xml#10121
sarvekshayr merged 3 commits intoapache:masterfrom
adoroszlai:HDDS-15108

Conversation

@adoroszlai
Copy link
Copy Markdown
Contributor

What changes were proposed in this pull request?

Some config properties are duplicated between ozone-default.xml and classes annotated with @Config. This causes the generated documentation to flip-flop between the different defaults/descriptions/tags (example: apache/ozone-site@57d92be).

This change:

  • adds sanity check in xml_to_md.py to catch duplicate properties
  • removes duplicates from ozone-default.xml
  • updates descriptions, tags and default values where necessary
  • fixes TestOzoneConfigurationFields by moving some constants out of the classes being checked
  • updates BasicRootedOzoneClientAdapterImpl to store OzoneClientConfig instead of creating it for each getFileChecksum call
  • removes hadoop.http.idle_timeout.ms from httpfs-default.xml (duplicated from ozone-default.xml)

https://issues.apache.org/jira/browse/HDDS-15108

How was this patch tested?

https://github.com/adoroszlai/ozone/actions/runs/24883493975

@adoroszlai adoroszlai self-assigned this Apr 24, 2026
Copy link
Copy Markdown
Contributor

@sreejasahithi sreejasahithi Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ozone.scm.block.deletion.per.dn.distribution.factor is defined twice consecutively with identical content. Since this PR is already cleaning up ozone-default.xml, could you remove the duplicate entry here as well?

Copy link
Copy Markdown
Contributor

@Russole Russole left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @adoroszlai for working on this. LGTM!

Copy link
Copy Markdown
Contributor

@sarvekshayr sarvekshayr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great catch! Thanks @adoroszlai for the fix. This resolves the multiple unnecessary commits seen in the ozone-site automated config PR.

LGTM.

@sarvekshayr sarvekshayr merged commit 6537759 into apache:master Apr 26, 2026
45 checks passed
@sarvekshayr
Copy link
Copy Markdown
Contributor

Thanks @adoroszlai for the patch, @sreejasahithi and @Russole for the review.

@adoroszlai adoroszlai deleted the HDDS-15108 branch April 27, 2026 19:56
@adoroszlai
Copy link
Copy Markdown
Contributor Author

Thanks @Russole, @sarvekshayr, @sreejasahithi for the review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants