sklaha commented on code in PR #249: URL: https://github.com/apache/cassandra-sidecar/pull/249#discussion_r2286693498
########## client-common/src/main/java/org/apache/cassandra/sidecar/common/response/CompactionStatsResponse.java: ########## @@ -0,0 +1,194 @@ +/* + * 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 + * + * http://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.cassandra.sidecar.common.response; + +import java.util.List; +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.cassandra.sidecar.common.response.data.ActiveCompactionEntry; + +/** + * Response class for the CompactionStats API + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +public class CompactionStatsResponse +{ + private final long concurrentCompactors; + private final Map<String, Map<String, Integer>> pendingTasks; + private final long totalPendingTasks; + private final long completedCompactions; + private final long dataCompacted; + private final long abortedCompactions; + private final long reducedCompactions; + private final long sstablesDroppedFromCompaction; + private final CompletedCompactionsRate completedCompactionsRate; + private final List<ActiveCompactionEntry> activeCompactions; + private final long activeCompactionsCount; + private final String activeCompactionsRemainingTime; + + /** + * Represents the completed compactions rate + */ + @JsonInclude(JsonInclude.Include.NON_NULL) + public static class CompletedCompactionsRate + { + private final String meanRate; + private final String fifteenMinuteRate; + + @JsonCreator + public CompletedCompactionsRate(@JsonProperty("meanRate") final String meanRate, + @JsonProperty("fifteenMinuteRate") final String fifteenMinuteRate) + { + this.meanRate = meanRate; + this.fifteenMinuteRate = fifteenMinuteRate; + } + + @JsonProperty("meanRate") + public String meanRate() + { + return meanRate; + } + + @JsonProperty("fifteenMinuteRate") + public String fifteenMinuteRate() + { + return fifteenMinuteRate; + } + } + + /** + * Constructs a new {@link CompactionStatsResponse}. + * + * @param concurrentCompactors number of concurrent compactors + * @param pendingTasks pending compaction tasks by keyspace and table + * @param totalPendingTasks total number of pending tasks + * @param completedCompactions total compactions completed + * @param dataCompacted total data compacted in bytes + * @param abortedCompactions total compactions aborted + * @param reducedCompactions total compactions reduced + * @param sstablesDroppedFromCompaction total SSTables dropped from compaction + * @param completedCompactionsRate completed compactions rate statistics + * @param activeCompactions list of active compactions + * @param activeCompactionsCount number of active compactions + * @param activeCompactionsRemainingTime estimated remaining time for active compactions formatted as "XhYYmZZs" + */ + @JsonCreator + public CompactionStatsResponse(@JsonProperty("concurrentCompactors") final long concurrentCompactors, + @JsonProperty("pendingTasks") final Map<String, Map<String, Integer>> pendingTasks, + @JsonProperty("totalPendingTasks") final long totalPendingTasks, + @JsonProperty("completedCompactions") final long completedCompactions, + @JsonProperty("dataCompacted") final long dataCompacted, + @JsonProperty("abortedCompactions") final long abortedCompactions, + @JsonProperty("reducedCompactions") final long reducedCompactions, + @JsonProperty("sstablesDroppedFromCompaction") final long sstablesDroppedFromCompaction, + @JsonProperty("completedCompactionsRate") final CompletedCompactionsRate completedCompactionsRate, + @JsonProperty("activeCompactions") final List<ActiveCompactionEntry> activeCompactions, + @JsonProperty("activeCompactionsCount") final long activeCompactionsCount, + @JsonProperty("activeCompactionsRemainingTime") final String activeCompactionsRemainingTime) + { + this.concurrentCompactors = concurrentCompactors; + this.pendingTasks = pendingTasks; + this.totalPendingTasks = totalPendingTasks; + this.completedCompactions = completedCompactions; + this.dataCompacted = dataCompacted; + this.abortedCompactions = abortedCompactions; + this.reducedCompactions = reducedCompactions; + this.sstablesDroppedFromCompaction = sstablesDroppedFromCompaction; + this.completedCompactionsRate = completedCompactionsRate; + this.activeCompactions = activeCompactions; + this.activeCompactionsCount = activeCompactionsCount; + this.activeCompactionsRemainingTime = activeCompactionsRemainingTime; + } + + @JsonProperty("concurrentCompactors") + public long concurrentCompactors() + { + return concurrentCompactors; + } + + @JsonProperty("pendingTasks") + public Map<String, Map<String, Integer>> pendingTasks() + { + return pendingTasks; + } + + @JsonProperty("totalPendingTasks") + public long totalPendingTasks() + { + return totalPendingTasks; + } + + @JsonProperty("completedCompactions") + public long completedCompactions() + { + return completedCompactions; + } + + @JsonProperty("dataCompacted") + public long dataCompacted() + { + return dataCompacted; + } + + @JsonProperty("abortedCompactions") + public long abortedCompactions() + { + return abortedCompactions; + } + + @JsonProperty("reducedCompactions") + public long reducedCompactions() + { + return reducedCompactions; + } + + @JsonProperty("sstablesDroppedFromCompaction") + public long sstablesDroppedFromCompaction() + { + return sstablesDroppedFromCompaction; + } + + @JsonProperty("completedCompactionsRate") + public CompletedCompactionsRate completedCompactionsRate() + { + return completedCompactionsRate; + } + + + @JsonProperty("activeCompactions") + public List<ActiveCompactionEntry> activeCompactions() + { + return activeCompactions; + } + + @JsonProperty("activeCompactionsCount") + public long activeCompactionsCount() + { + return activeCompactionsCount; + } + + @JsonProperty("activeCompactionsRemainingTime") + public String activeCompactionsRemainingTime() + { + return activeCompactionsRemainingTime; + } +} Review Comment: Done ########## adapters/adapters-base/src/main/java/org/apache/cassandra/sidecar/adapters/base/CassandraMetricsOperations.java: ########## @@ -250,4 +278,187 @@ private List<ClientConnectionEntry> statsToEntries(Stream<ConnectedClientStats> stat.authenticationMode, stat.authenticationMetadata); } + + /** + * Represents the metrics related to compaction stats that are supported by the Sidecar + */ + public enum CompactionStatsMetrics + { + TOTAL_COMPACTIONS_COMPLETED("TotalCompactionsCompleted", MetricType.COUNTER), + BYTES_COMPACTED("BytesCompacted", MetricType.COUNTER), + COMPACTIONS_ABORTED("CompactionsAborted", MetricType.COUNTER), + COMPACTIONS_REDUCED("CompactionsReduced", MetricType.COUNTER), + SSTABLES_DROPPED_FROM_COMPACTION("SSTablesDroppedFromCompaction", MetricType.COUNTER), + PENDING_TASKS_BY_TABLE_NAME("PendingTasksByTableName", MetricType.GAUGE); + + private final String metricName; + private final MetricType type; + + CompactionStatsMetrics(String metricName, MetricType type) + { + this.metricName = metricName; + this.type = type; + } + + String metricName() + { + return metricName; + } + } + /** + * {@inheritDoc} + */ + @Override + public CompactionStatsResponse compactionStats() + { + // Get compaction manager and storage service proxies + CompactionManagerJmxOperations compactionManager = jmxClient.proxy(CompactionManagerJmxOperations.class, COMPACTION_MANAGER_OBJ_NAME); + StorageJmxOperations storageService = jmxClient.proxy(StorageJmxOperations.class, STORAGE_SERVICE_OBJ_NAME); + + // Get concurrent compactors from StorageService as per specification + long concurrentCompactors = storageService.getConcurrentCompactors(); + + // Get pending tasks grouped by keyspace and table + Map<String, Map<String, Integer>> pendingTasks = getPendingCompactionTasksByTable(); + long totalPendingTasks = pendingTasks.values().stream() + .mapToLong(tableMap -> tableMap.values().stream().mapToInt(Integer::intValue).sum()) + .sum(); + + // Get compaction metrics from JMX counters and meters + long completedCompactions = getValueAsLong(getCompactionMetric(CompactionStatsMetrics.TOTAL_COMPACTIONS_COMPLETED)); + long dataCompacted = getValueAsLong(getCompactionMetric(CompactionStatsMetrics.BYTES_COMPACTED)); + long abortedCompactions = getValueAsLong(getCompactionMetric(CompactionStatsMetrics.COMPACTIONS_ABORTED)); + long reducedCompactions = getValueAsLong(getCompactionMetric(CompactionStatsMetrics.COMPACTIONS_REDUCED)); + long sstablesDroppedFromCompaction = getValueAsLong(getCompactionMetric(CompactionStatsMetrics.SSTABLES_DROPPED_FROM_COMPACTION)); + + // Get completed compactions rate with proper time conversions + CompactionStatsResponse.CompletedCompactionsRate completedCompactionsRate = getCompletedCompactionsRate(); + + // Get active compactions with all required fields + List<ActiveCompactionEntry> activeCompactions = getActiveCompactions(compactionManager.getCompactions()); + long activeCompactionsCount = activeCompactions.size(); + + // Calculate remaining time in seconds based on throughput and remaining bytes + String activeCompactionsRemainingTime = calculateRemainingTimeSeconds(activeCompactions, storageService); + + return new CompactionStatsResponse(concurrentCompactors, pendingTasks, totalPendingTasks, + completedCompactions, dataCompacted, abortedCompactions, + reducedCompactions, sstablesDroppedFromCompaction, + completedCompactionsRate, + activeCompactions, activeCompactionsCount, activeCompactionsRemainingTime); + } + + private Map<String, Map<String, Integer>> getPendingCompactionTasksByTable() + { + // Get pending tasks by table name from Gauge metric + Object value = getCompactionMetric(CompactionStatsMetrics.PENDING_TASKS_BY_TABLE_NAME); + return parsePendingTasksMap(value); + } + + private Map<String, Map<String, Integer>> parsePendingTasksMap(final Object value) + { + Map<?, ?> rawMap = safeCast(value, Map.class, "pending tasks"); + Map<String, Map<String, Integer>> result = new HashMap<>(); + + for (Map.Entry<?, ?> entry : rawMap.entrySet()) + { + String keyspace = safeCast(entry.getKey(), String.class, "keyspace name"); + Map<?, ?> rawTableMap = safeCast(entry.getValue(), Map.class, "table data"); + Map<String, Integer> tableMap = new HashMap<>(); + + for (Map.Entry<?, ?> tableEntry : rawTableMap.entrySet()) + { + String tableName = safeCast(tableEntry.getKey(), String.class, "table name"); + Number taskCount = safeCast(tableEntry.getValue(), Number.class, "task count"); + tableMap.put(tableName, taskCount.intValue()); + } + + result.put(keyspace, tableMap); + } + + return result; + } + + private Object getCompactionMetric(final CompactionStatsMetrics metric) + { + String metricObjectType = String.format(METRICS_OBJ_TYPE_COMPACTION, metric.metricName()); + return queryMetric(metricObjectType, metric.type); + } + + private CompactionStatsResponse.CompletedCompactionsRate getCompletedCompactionsRate() + { + // Get rates from meter metric for TotalCompactionsCompleted + String metricObjectType = String.format(METRICS_OBJ_TYPE_COMPACTION, "TotalCompactionsCompleted"); + MeterMetricsJmxOperations metricsProxy = jmxClient.proxy(MeterMetricsJmxOperations.class, metricObjectType); + + // Convert rates according to specification: + // meanRate: compactions per hour + // fifteenMinuteRate: compactions per minute for last 15 minutes + double meanRateValue = metricsProxy.getMeanRate() * 3600; // Convert per second to per hour + double fifteenMinuteRateValue = metricsProxy.getFifteenMinuteRate() * 60; // Convert per second to per minute + + String meanRate = String.format("%.2f/hour", meanRateValue); + String fifteenMinuteRate = String.format("%.2f/minute", fifteenMinuteRateValue); + + return new CompactionStatsResponse.CompletedCompactionsRate(meanRate, fifteenMinuteRate); + } + + + private List<ActiveCompactionEntry> getActiveCompactions(final List<Map<String, String>> compactions) + { + return compactions.stream().map(compactionInfo -> { + // Extract fields according to specification + String id = compactionInfo.getOrDefault(COMPACTION_ID, DEFAULTVAL_STRING); + String keyspace = compactionInfo.getOrDefault(KEYSPACE, DEFAULTVAL_STRING); + String columnFamily = compactionInfo.getOrDefault(COLUMNFAMILY, DEFAULTVAL_STRING); + String taskType = compactionInfo.getOrDefault(TASK_TYPE, DEFAULTVAL_STRING); + + // Parse byte values + long completedBytes = safeParseLong(compactionInfo.getOrDefault(COMPLETED, DEFAULTVAL_NUMBER), "completed bytes"); + long totalBytes = safeParseLong(compactionInfo.getOrDefault(TOTAL, DEFAULTVAL_NUMBER), "total bytes"); + + // Calculate percentage completed + double percentCompleted = totalBytes == -1 ? 0.0 : (double) completedBytes / totalBytes * 100.0; + + // Parse SSTables list + String ssTablesStr = compactionInfo.getOrDefault(SSTABLES, DEFAULTVAL_STRING); Review Comment: Yes. Actually, making all string values blank will be better to avoid confusion. Updated it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org For additional commands, e-mail: pr-h...@cassandra.apache.org
