HDDS-11563. [OM/SCM/DN] WebUI Display Namespace #7321
Conversation
|
LGTM. |
| @@ -26,4 +26,6 @@ | |||
| */ | |||
| @InterfaceAudience.Private | |||
| public interface DNMXBean extends ServiceRuntimeInfo { | |||
|
|
|||
| String getNamespace(); | |||
There was a problem hiding this comment.
If you would like to display "namespace" in the generic overview section, I think getNamespace() should be defined in ServiceRuntimeInfo, where the other generic properties (started/version/compiled) are defined.
| public String getNamespace() { | ||
| return ""; | ||
| } |
There was a problem hiding this comment.
nit: use default method in the interface instead of overriding with dummy value.
| <th>Namespace:</th> | ||
| <td>{{$ctrl.jmx.Namespace}}</td> |
There was a problem hiding this comment.
This needs to be displayed conditionally, only if not empty. Only HA setup has service ID.
| String localScmServiceId = conf.getTrimmed( | ||
| ScmConfigKeys.OZONE_SCM_DEFAULT_SERVICE_ID); | ||
| if (localScmServiceId == null) { | ||
| Collection<String> scmServiceIds = conf.getTrimmedStringCollection(OZONE_SCM_SERVICE_IDS_KEY); | ||
| return String.join(",", scmServiceIds); | ||
| } | ||
| return localScmServiceId; |
There was a problem hiding this comment.
Call existing method to determine the single service that the datanode belongs to:
to avoid duplication and mismatch (in case of change).
| @@ -33,6 +33,15 @@ | |||
| */ | |||
| public interface ServiceRuntimeInfo { | |||
|
|
|||
| /** | |||
| * Gets the namespace of Hadoop. | |||
There was a problem hiding this comment.
nit: reference to Hadoop in existing comments is outdated; no need to fix that, but let's not repeat it. :)
| @@ -73,6 +74,7 @@ | |||
|
|
|||
| import static org.apache.hadoop.hdds.protocol.DatanodeDetails.Port.Name.HTTP; | |||
| import static org.apache.hadoop.hdds.protocol.DatanodeDetails.Port.Name.HTTPS; | |||
| import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_SERVICE_IDS_KEY; | |||
There was a problem hiding this comment.
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
77: Unused import - org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_SERVICE_IDS_KEY.
There was a problem hiding this comment.
@adoroszlai Thank you for your very good suggestion. I have fixed these issues, please help me review again.
What changes were proposed in this pull request?
We have enhanced the web UI to display cluster information for OM (Ozone Manager), SCM (Storage Container Manager), and DN (DataNode).
Please describe your PR in detail:
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-11563
How was this patch tested?
It is Only WebUI.
SCM
OM
Datanode