Skip to content

Conversation

@Russole
Copy link
Contributor

@Russole Russole commented Dec 8, 2025

What changes were proposed in this pull request?

This PR standardizes configuration key definitions across the codebase.
Many configuration classes annotated with @ConfigGroup(prefix = "...") still use unprefixed keys in their @Config(key = ...) entries (e.g., "shutdown.timeout" instead of "ozone.service.shutdown.timeout").
This patch updates those entries to explicitly include the full prefix in the key literal.

Benefits of this change include:

  • Consistent and clearer configuration style across modules.
  • Fully-qualified keys become searchable directly in the source code.
  • Avoid ambiguity between prefixed and unprefixed keys.
  • Improves maintainability and readability of configuration metadata

Only keys missing the prefix were updated.
Keys already using a fully-qualified name were left unchanged.
No functional behavior is modified.

What is the link to the Apache JIRA

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

How was this patch tested?

All GitHub CI checks passed successfully. No functional behavior is changed.

Copy link
Contributor

@Gargi-jais11 Gargi-jais11 left a comment

Choose a reason for hiding this comment

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

Thanks @Russole for working on this patch.
I have checked all the places configKey include configGroup(Prefix).

Copy link
Contributor

@adoroszlai adoroszlai left a comment

Choose a reason for hiding this comment

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

Thanks @Russole for the patch.

Comment on lines 35 to 37
public static final String OM_CLIENT_RPC_TIME_OUT = "rpc.timeout";
public static final String OM_CLIENT_RPC_TIME_OUT = "ozone.om.client.rpc.timeout";
public static final String OM_TRASH_EMPTIER_CORE_POOL_SIZE
= "trash.core.pool.size";
= "ozone.om.client.trash.core.pool.size";
Copy link
Contributor

Choose a reason for hiding this comment

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

Please inline these constants (use string value directly in key). They are not used elsewhere.

Comment on lines 34 to 40
public static final String SCM_CLIENT_RPC_TIME_OUT = "rpc.timeout";
public static final String SCM_CLIENT_RPC_TIME_OUT = "hdds.scmclient.rpc.timeout";
public static final String SCM_CLIENT_FAILOVER_MAX_RETRY =
"failover.max.retry";
"hdds.scmclient.failover.max.retry";
public static final String SCM_CLIENT_MAX_RETRY_TIMEOUT =
"max.retry.timeout";
"hdds.scmclient.max.retry.timeout";
public static final String SCM_CLIENT_RETRY_INTERVAL =
"failover.retry.interval";
"hdds.scmclient.failover.retry.interval";
Copy link
Contributor

Choose a reason for hiding this comment

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

Please inline these constants.

public static final String PREFIX = "hdds.datanode.replication";
public static final String STREAMS_LIMIT_KEY = "streams.limit";
public static final String QUEUE_LIMIT = "queue.limit";
public static final String QUEUE_LIMIT = "hdds.datanode.replication.queue.limit";
Copy link
Contributor

Choose a reason for hiding this comment

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

Please inline this constant.

@Russole
Copy link
Contributor Author

Russole commented Dec 8, 2025

Thank you @Gargi-jais11 and @adoroszlai for the helpful review comments.
I've updated the patch and inlined the configuration key constants as suggested.
Please review again when convenient.

Copy link
Contributor

@Gargi-jais11 Gargi-jais11 left a comment

Choose a reason for hiding this comment

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

LGTM!

@adoroszlai adoroszlai merged commit eaa7b65 into apache:master Dec 8, 2025
43 checks passed
@adoroszlai
Copy link
Contributor

Thanks @Russole for the patch, @Gargi-jais11 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.

3 participants