sklaha commented on code in PR #249:
URL: https://github.com/apache/cassandra-sidecar/pull/249#discussion_r2286692866
##########
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);
+ List<String> ssTables = ssTablesStr.isEmpty() ?
+ List.of() : List.of(ssTablesStr.split(","));
+
+ String targetDirectory =
compactionInfo.getOrDefault(TARGET_DIRECTORY, DEFAULTVAL_STRING);
+
+ return new ActiveCompactionEntry(id, keyspace, columnFamily,
taskType,
+ completedBytes, totalBytes,
percentCompleted,
+ ssTables, targetDirectory);
+ }).collect(Collectors.toList());
+ }
+
+ private String calculateRemainingTimeSeconds(final
List<ActiveCompactionEntry> activeCompactions,
+ final StorageJmxOperations
storageService)
+ {
+ if (activeCompactions.isEmpty())
+ {
+ return DEFAULTVAL_N_A;
+ }
+
+ // Calculate total remaining bytes across all active compactions
+ long totalRemainingBytes = activeCompactions.stream()
+ .filter(compaction -> compaction.totalBytes() >= 0 &&
compaction.completedBytes() >= 0)
+ .mapToLong(compaction -> Math.max(0, compaction.totalBytes() -
compaction.completedBytes()))
+ .sum();
+
+ long throughputBytesPerSec =
storageService.getCompactionThroughtputBytesPerSec();
+ if (totalRemainingBytes < 0 || throughputBytesPerSec <= 0)
+ {
+ return DEFAULTVAL_N_A;
+ }
+
+ // Calculate time in seconds (throughput is already in bytes/sec)
+ long remainingTimeInSecs = totalRemainingBytes / throughputBytesPerSec;
Review Comment:
done
##########
client-common/src/main/java/org/apache/cassandra/sidecar/common/request/CompactionStatsRequest.java:
##########
@@ -0,0 +1,46 @@
+/*
+ * 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.request;
+
+import io.netty.handler.codec.http.HttpMethod;
+import org.apache.cassandra.sidecar.common.ApiEndpointsV1;
+import org.apache.cassandra.sidecar.common.response.CompactionStatsResponse;
+
+/**
+ * Represents a request to get compaction statistics from the node
+ */
+public class CompactionStatsRequest extends
JsonRequest<CompactionStatsResponse>
+{
+ /**
+ * Constructs a request to retrieve the Cassandra node compaction
statistics
+ */
+ public CompactionStatsRequest()
+ {
+ super(ApiEndpointsV1.COMPACTION_STATS_ROUTE);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public HttpMethod method()
+ {
+ return HttpMethod.GET;
+ }
+}
Review Comment:
Done
##########
client-common/src/main/java/org/apache/cassandra/sidecar/common/response/data/ActiveCompactionEntry.java:
##########
@@ -0,0 +1,131 @@
+/*
+ * 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.data;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Represents an active compaction entry
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ActiveCompactionEntry
+{
+ private final String id;
+ private final String keyspace;
+ private final String columnFamily;
+ private final String taskType;
+ private final long completedBytes;
+ private final long totalBytes;
+ private final double percentCompleted;
+ private final List<String> ssTables;
+ private final String targetDirectory;
+
+ /**
+ * Constructs a new {@link ActiveCompactionEntry}.
+ *
+ * @param id compaction ID
+ * @param keyspace keyspace name
+ * @param columnFamily table/column family name
+ * @param taskType type of compaction task
+ * @param completedBytes completed compaction in bytes
+ * @param totalBytes total compaction in bytes
+ * @param percentCompleted percentage of completed compactions
+ * @param ssTables list of SSTables being compacted
+ * @param targetDirectory target directory for output
+ */
+ @JsonCreator
+ public ActiveCompactionEntry(@JsonProperty("id") final String id,
+ @JsonProperty("keyspace") final String
keyspace,
+ @JsonProperty("columnFamily") final String
columnFamily,
+ @JsonProperty("taskType") final String
taskType,
+ @JsonProperty("completedBytes") final long
completedBytes,
+ @JsonProperty("totalBytes") final long
totalBytes,
+ @JsonProperty("percentCompleted") final
double percentCompleted,
+ @JsonProperty("ssTables") final List<String>
ssTables,
+ @JsonProperty("targetDirectory") final String
targetDirectory)
Review Comment:
Done
--
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
