Skip to content

Conversation

@adoroszlai
Copy link
Contributor

What changes were proposed in this pull request?

Set the following properties directly in Configuration instead of using methods of MiniOzoneCluster.Builder:

  • hbInterval
  • hbProcessorInterval
  • omLayoutVersion
  • pipelineNumLimit
  • scmLayoutVersion

Default values are added to ozone-site.xml for integration-test, where applicable.

Remove heartbeat config from Test2WayCommitInRatis, TestQueryNode. Previously these set it via Configuration, but not via MiniOzoneCluster, which overwrote them with its defaults. Now after removing the config from MiniOzoneCluster, these tests suddenly started failing due to the custom heartbeat intervals.

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

How was this patch tested?

CI:
https://github.com/adoroszlai/ozone/actions/runs/7806174237

@adoroszlai adoroszlai added test code-cleanup Changes that aim to make code better, without changing functionality. labels Feb 7, 2024
@adoroszlai adoroszlai self-assigned this Feb 7, 2024
Copy link
Contributor

@hemantk-12 hemantk-12 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 the clean up and reorganizing.

Overall looks good to me. Left one suggestion comment and other one is more of a question.

One more thing, we can also remove setNumDatanodes(3) because 3 is default value.

@adoroszlai
Copy link
Contributor Author

Thanks @hemantk-12 for the review.

One more thing, we can also remove setNumDatanodes(3) because 3 is default value.

I agree, but this patch is only part of a multi-step cleanup task (HDDS-6739), it does not try to fix all items.

@adoroszlai adoroszlai merged commit e93e781 into apache:master Feb 8, 2024
@adoroszlai adoroszlai deleted the HDDS-10291 branch February 8, 2024 17:50
@adoroszlai
Copy link
Contributor Author

Thanks a lot @hemantk-12 for the review.

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

Labels

code-cleanup Changes that aim to make code better, without changing functionality. test

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants