sklaha commented on code in PR #249:
URL: https://github.com/apache/cassandra-sidecar/pull/249#discussion_r2302695494
##########
integration-tests/src/integrationTest/org/apache/cassandra/sidecar/routes/CassandraStatsIntegrationTest.java:
##########
@@ -256,4 +280,284 @@ void assertClientStatsResponse(HttpResponse<Buffer>
response, Map<String, Boolea
}
}
}
+
+ @Test
+ void testCompactionStatsRetrieval()
+ {
+ logger.info("Starting compaction stats test with {} tables",
COMPACTION_TEST_TABLES.size());
+
+ // Generate SSTables for all test tables
+ for (QualifiedName tableName : COMPACTION_TEST_TABLES)
+ {
+ generateSSTables(tableName, 100);
+ }
+
+ // Create threads to trigger compaction on all tables
+ List<Thread> compactionThreads = new ArrayList<>();
+ for (QualifiedName tableName : COMPACTION_TEST_TABLES)
+ {
+ Thread thread = new Thread(() ->
triggerCompactionForTable(tableName));
+ compactionThreads.add(thread);
+ }
+
+ // Start all compaction threads
+ for (Thread thread : compactionThreads)
+ {
+ thread.start();
+ }
+
+ // Poll immediately and repeatedly to catch active compactions
+ CompactionStatsResponse stats = null;
+ HttpResponse<Buffer> response;
+ boolean foundActiveCompactions;
+
+ for (int attempt = 0; attempt < MAX_POLL_ATTEMPTS; attempt++)
+ {
+ try
+ {
+ response = getBlocking(
+ trustedClient().get(serverWrapper.serverPort,
"localhost", COMPACTION_STATS_ROUTE)
+ .send()
+ .expecting(HttpResponseExpectation.SC_OK));
+
+ stats = response.bodyAsJson(CompactionStatsResponse.class);
+ foundActiveCompactions = !stats.activeCompactions().isEmpty();
+
+ if (foundActiveCompactions)
+ {
+ logger.info("SUCCESS: Found {} active compactions on
attempt {}",
+ stats.activeCompactionsCount(), attempt + 1);
+ break;
+ }
+ else
+ {
+ logger.info("Attempt {}: No active compactions yet",
attempt + 1);
+ }
+
+ Thread.sleep(100); // Short sleep between attempts
+ }
+ catch (InterruptedException e)
+ {
+ Thread.currentThread().interrupt();
+ break;
+ }
+ }
+
+ // Wait for all compaction threads to complete
+ for (Thread thread : compactionThreads)
+ {
+ try
+ {
+ thread.join(5000);
+ }
+ catch (InterruptedException e)
+ {
+ Thread.currentThread().interrupt();
+ break;
+ }
+ }
+ assertThat(stats).isNotNull();
+ logger.info("Response:{}", stats);
+ validateCompactionStatsResponse(stats);
+ }
+
+
+ private void generateSSTables(QualifiedName tableName, int numSSTables)
+ {
+ for (int batch = 0; batch < numSSTables; batch++)
+ {
+ for (int i = batch * 1000; i < (batch + 1) * 1000; i++)
+ {
+ String statement = String.format("INSERT INTO %s (id, data)
VALUES (%d, '%s');",
+ tableName, i, "data" + i);
+ cluster.schemaChangeIgnoringStoppedInstances(statement);
+ }
+ cluster.stream().forEach(instance ->
instance.flush(TEST_KEYSPACE));
+ }
+ }
+
+ private void triggerCompactionForTable(QualifiedName tableName)
+ {
+ cluster.stream().forEach(instance ->
+ {
+ try
+ {
+ instance.nodetool("compact", tableName.keyspace(),
tableName.table());
+ }
+ catch (Exception e)
+ {
+ logger.warn("Failed to trigger compaction for {}: {}",
tableName, e.getMessage());
+ }
+ });
+ }
+
+ private void validateCompactionStatsResponse(CompactionStatsResponse stats)
+ {
+ assertThat(stats).isNotNull();
+
+ // Basic counters validation
+ assertThat(stats.concurrentCompactors()).isGreaterThanOrEqualTo(0);
+ assertThat(stats.totalPendingTasks()).isGreaterThanOrEqualTo(0);
+ assertThat(stats.completedCompactions()).isGreaterThanOrEqualTo(0);
+ assertThat(stats.dataCompacted()).isGreaterThanOrEqualTo(0);
+ assertThat(stats.abortedCompactions()).isGreaterThanOrEqualTo(0);
+ assertThat(stats.reducedCompactions()).isGreaterThanOrEqualTo(0);
+
assertThat(stats.sstablesDroppedFromCompaction()).isGreaterThanOrEqualTo(0);
+
+ // Pending tasks validation
+ assertThat(stats.pendingTasks()).isNotNull();
+
+ // Validate each pending task entry if there are any
+ if (!stats.pendingTasks().isEmpty())
+ {
+ validatePendingTasks(stats);
+ }
+
+ // Completion rates validation
+ assertThat(stats.completedCompactionsRate()).isNotNull();
+
+ // Validate mean rate format is X.XX/hour
+ assertThat(stats.completedCompactionsRate().meanRate())
+ .as("Mean rate should not be null")
+ .isNotNull();
+
+ // Validate fifteen minute rate format is X.XX/minute
+ assertThat(stats.completedCompactionsRate().fifteenMinuteRate())
+ .as("Fifteen minute rate should not be null")
+ .isNotNull();
+
+ // Active compactions validation
+ assertThat(stats.activeCompactions()).isNotNull();
+
assertThat(stats.activeCompactionsCount()).isEqualTo(stats.activeCompactions().size());
+
assertThat(stats.activeCompactionsRemainingTime()).isGreaterThanOrEqualTo(0L);
+
+ // Detailed active compaction validation when compactions are found
+ if (!stats.activeCompactions().isEmpty())
+ {
+ validateActiveCompactions(stats);
+
+ logger.info("All {} active compactions validated successfully",
stats.activeCompactionsCount());
+ }
+ else
+ {
+ logger.info("No active compactions to validate - basic structure
validation completed");
+ }
+
+ logger.info("Compaction stats validation successful. Active: {},
Completed: {}, Pending: {}",
+ stats.activeCompactionsCount(), stats.completedCompactions(),
stats.totalPendingTasks());
+ }
+
+ private void validatePendingTasks(CompactionStatsResponse stats)
+ {
+ stats.pendingTasks().forEach((keyspace, tableMap) -> {
+ assertThat(keyspace)
+ .as("Pending task keyspace should not be blank")
+ .isNotBlank();
+ assertThat(tableMap)
+ .as("Pending task table map should not be null")
+ .isNotNull();
+
+ tableMap.forEach((table, count) -> {
+ assertThat(table)
+ .as("Pending task table name should not be blank")
+ .isNotBlank();
+ assertThat(count)
+ .as("Pending task count should be non-negative")
+ .isGreaterThanOrEqualTo(0);
+ });
+ });
+ logger.info("Validated {} pending task keyspaces",
stats.pendingTasks().size());
+ }
+
+ private void validateActiveCompactions(CompactionStatsResponse stats)
+ {
+ logger.info("Validating {} active compaction entries",
stats.activeCompactionsCount());
+
+ for (int i = 0; i < stats.activeCompactions().size(); i++)
+ {
+ ActiveCompactionEntry compaction =
stats.activeCompactions().get(i);
+ logger.info("Validating active compaction {}: {}", i + 1,
compaction.id());
+
+ // Required fields validation
+ assertThat(compaction.id())
+ .as("Active compaction ID should not be null")
+ .isNotNull();
+
+ assertThat(compaction.keyspace())
+ .as("Active compaction keyspace should not be null")
+ .isNotNull()
+ .isNotBlank();
Review Comment:
Updated.
##########
client-common/src/main/java/org/apache/cassandra/sidecar/common/response/data/ActiveCompactionEntry.java:
##########
@@ -0,0 +1,296 @@
+/*
+ * 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;
+import org.apache.cassandra.sidecar.common.DataObjectBuilder;
+
+/**
+ * Represents an active compaction entry
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ActiveCompactionEntry
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
