-
Notifications
You must be signed in to change notification settings - Fork 478
Add Resource Group Overview tables to the Monitor Home page #6240
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
DomGarguilo
wants to merge
4
commits into
apache:main
Choose a base branch
from
DomGarguilo:monitorOverview
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+222
−38
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
2eab4a0
Add Resource Group Overview tables to the Monitor Home page
DomGarguilo 3f9d16d
Merge remote-tracking branch 'upstream/main' into monitorOverview
DomGarguilo ca6af6b
build deployment view on finalize
DomGarguilo 0fed858
Merge remote-tracking branch 'upstream/main' into monitorOverview
DomGarguilo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
...monitor/src/main/java/org/apache/accumulo/monitor/next/deployment/DeploymentOverview.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.accumulo.monitor.next.deployment; | ||
|
|
||
| import java.util.Comparator; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import org.apache.accumulo.core.client.admin.servers.ServerId; | ||
| import org.apache.accumulo.core.data.ResourceGroupId; | ||
| import org.apache.accumulo.monitor.next.SystemInformation.ProcessSummary; | ||
|
|
||
| /** | ||
| * Data Transfer Object for the Monitor Overview page deployment tables. It packages the total, | ||
| * responding, and not responding server counts for each process in each resource group into a | ||
| * UI-ready JSON response. | ||
| */ | ||
| public record DeploymentOverview(long lastUpdate, List<ResourceGroupDeployment> groups) { | ||
|
|
||
| /** | ||
| * Data Transfer Object for a resource group and its associated server counts | ||
| */ | ||
| public record ResourceGroupDeployment(String resourceGroup, | ||
| List<ServerTypeDeployment> processes) { | ||
| } | ||
|
|
||
| /** | ||
| * Data Transfer Object for a server type and its associated counts | ||
| */ | ||
| public record ServerTypeDeployment(String serverType, long total, long responding, | ||
| long notResponding) { | ||
| } | ||
|
|
||
| public static DeploymentOverview fromSummary( | ||
| Map<ResourceGroupId,Map<ServerId.Type,ProcessSummary>> deployment, long lastUpdate) { | ||
| if (deployment == null || deployment.isEmpty()) { | ||
| return new DeploymentOverview(lastUpdate, List.of()); | ||
| } | ||
|
|
||
| var groups = deployment.entrySet().stream().sorted(Map.Entry.comparingByKey()).map(entry -> { | ||
| String resourceGroup = entry.getKey().canonical(); | ||
| List<ServerTypeDeployment> processes = buildProcesses(entry.getValue()); | ||
| return new ResourceGroupDeployment(resourceGroup, processes); | ||
| }).toList(); | ||
|
|
||
| return new DeploymentOverview(lastUpdate, groups); | ||
| } | ||
|
|
||
| private static List<ServerTypeDeployment> | ||
| buildProcesses(Map<ServerId.Type,ProcessSummary> processes) { | ||
| if (processes == null || processes.isEmpty()) { | ||
| return List.of(); | ||
| } | ||
|
|
||
| return processes.entrySet().stream() | ||
| .sorted(Map.Entry.comparingByKey(Comparator.comparingInt(Enum::ordinal))).map(entry -> { | ||
| ServerId.Type key = entry.getKey(); | ||
| ProcessSummary value = entry.getValue(); | ||
| return new ServerTypeDeployment(processLabel(key), value.getTotal(), value.getResponded(), | ||
| value.getNotResponded()); | ||
| }).toList(); | ||
| } | ||
|
|
||
| private static String processLabel(ServerId.Type process) { | ||
| return switch (process) { | ||
| case COMPACTOR -> "Compactor"; | ||
| case GARBAGE_COLLECTOR -> "Garbage Collector"; | ||
| case MANAGER -> "Manager"; | ||
| case MONITOR -> "Monitor"; | ||
| case SCAN_SERVER -> "Scan Server"; | ||
| case TABLET_SERVER -> "Tablet Server"; | ||
| }; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added a new collection here. Now we collect servers who didnt respond to the metrics poll into this new
metricProblemHostsand that number is what is used in the table for the "Not Responding" count. Made this separation sinceproblemHostscould contain hosts that are still responding but just have other problems.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, it's possible that a Compactor doesn't respond to the call to get the Metrics, but does respond to the call to get the currently running compaction. Seems odd, but could happen.