Skip to content

Created generic ServersView object #6278

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.

Sign up for GitHub

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

Draft
dlmarion wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Created generic ServersView object #6278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e58011
wip
dlmarion Mar 30, 2026
18288fd
Reworked ScanServer view using generic ServersView object
dlmarion Mar 30, 2026
8e022a3
Fix build
dlmarion Mar 31, 2026
b87a2b2
Attempting to get the table to render
dlmarion Mar 31, 2026
cce9b3e
Changes to get the table to render
dlmarion Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/monitor/src/main/java/org/apache/accumulo/monitor/next/Endpoints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
import org.apache.accumulo.monitor.next.SystemInformation.TimeOrderedRunningCompactionSet;
import org.apache.accumulo.monitor.next.ec.CompactorsSummary;
import org.apache.accumulo.monitor.next.ec.CoordinatorSummary;
import org.apache.accumulo.monitor.next.sservers.ScanServerView;
import org.apache.accumulo.monitor.next.views.ServersView;

import io.micrometer.core.instrument.Meter.Id;
import io.micrometer.core.instrument.cumulative.CumulativeDistributionSummary;
Expand Down Expand Up @@ -275,7 +275,7 @@ public Map<Id,CumulativeDistributionSummary> getScanServerAllMetricSummary() {
@Path("sservers/view")
@Produces(MediaType.APPLICATION_JSON)
@Description("Returns a UI-ready view model for the Scan Server status page")
public ScanServerView getScanServerPageView() {
public ServersView getScanServerPageView() {
return monitor.getInformationFetcher().getSummaryForEndpoint().getScanServerView();
}

Expand Down
25 changes: 16 additions & 9 deletions server/monitor/src/main/java/org/apache/accumulo/monitor/next/SystemInformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
import org.apache.accumulo.core.process.thrift.MetricResponse;
import org.apache.accumulo.core.spi.balancer.TableLoadBalancer;
import org.apache.accumulo.core.util.compaction.RunningCompactionInfo;
import org.apache.accumulo.monitor.next.sservers.ScanServerView;
import org.apache.accumulo.monitor.next.views.ServersView;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.conf.TableConfiguration;
import org.apache.accumulo.server.metrics.MetricResponseWrapper;
Expand Down Expand Up @@ -418,7 +418,7 @@ public Stream<RunningCompactionInfo> stream() {
private final Set<String> configuredCompactionResourceGroups = ConcurrentHashMap.newKeySet();

private long timestamp = 0;
private ScanServerView scanServerView;
private ServersView scanServerView;
private final int rgLongRunningCompactionSize;

public SystemInformation(Cache<ServerId,MetricResponse> allMetrics, ServerContext ctx) {
Expand Down Expand Up @@ -607,6 +607,9 @@ public void finish() {
for (String rg : getResourceGroups()) {
Set<ServerId> rgCompactors = getCompactorResourceGroupServers(rg);
List<FMetric> metrics = queueMetrics.get(rg);
if (metrics == null || metrics.isEmpty()) {
continue;
}
Optional<FMetric> queued = metrics.stream()
.filter(fm -> fm.name().equals(Metric.COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_QUEUED.getName()))
.findFirst();
Expand All @@ -620,6 +623,9 @@ public void finish() {
// Check for idle compactors.
Map<Id,CumulativeDistributionSummary> rgMetrics =
getCompactorResourceGroupMetricSummary(rg);
if (rgMetrics == null || rgMetrics.isEmpty()) {
continue;
}
Optional<Entry<Id,CumulativeDistributionSummary>> idleMetric = rgMetrics.entrySet()
.stream().filter(e -> e.getKey().getName().equals(Metric.SERVER_IDLE.getName()))
.findFirst();
Expand All @@ -642,14 +648,15 @@ public void finish() {
}
}

timestamp = System.currentTimeMillis();

// Compute ScanServer view
Set<ServerId> scanServers = new HashSet<>();
sservers.values().forEach(scanServers::addAll);
int problemScanServerCount = (int) problemHosts.stream()
.filter(serverId -> serverId.getType() == ServerId.Type.SCAN_SERVER).count();
var responses = allMetrics.getAllPresent(scanServers).values();
timestamp = System.currentTimeMillis();
scanServerView = ScanServerView.fromMetrics(responses, scanServers.size(),
problemScanServerCount, timestamp);
scanServerView = new ServersView(
scanServers, problemHosts.stream()
.filter(serverId -> serverId.getType() == ServerId.Type.SCAN_SERVER).count(),
allMetrics, timestamp);
}

public Set<String> getResourceGroups() {
Expand Down Expand Up @@ -743,7 +750,7 @@ public long getTimestamp() {
return this.timestamp;
}

public ScanServerView getScanServerView() {
public ServersView getScanServerView() {
return this.scanServerView;
}

Expand Down
172 changes: 0 additions & 172 deletions server/monitor/src/main/java/org/apache/accumulo/monitor/next/sservers/ScanServerView.java
View file
Open in desktop

This file was deleted.

Loading