natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in AutoRepair duration metric calculation if schedule finishes quickly 

patch by Jaydeepkumar Chovatia; reviewed by Andy Tolbert for CASSANDRA-20622
This commit is contained in:
jaydeepkumar1984 2025-05-05 18:39:07 -07:00 committed by Andy Tolbert
parent f2bf017e6d
commit f6eb4a6b31
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
5.1
* Fix a bug in AutoRepair duration metric calculation if schedule finishes quickly (CASSANDRA-20622)
* Fix AutoRepair flaky InJvm dtest (CASSANDRA-20620)
* Increasing default for auto_repair.sstable_upper_threshold considering large Cassandra tables & revert three lines removed from CHANGES.txt due to a merge mistake (CASSANDRA-20586)
* Fix token restrictions with MIN_TOKEN (CASSANDRO-20557)

2
src/java/org/apache/cassandra/repair/autorepair/AutoRepair.java
View File

@ -469,7 +469,7 @@ public class AutoRepair
repairState.setSucceededTokenRangesCount(collectedRepairStats.succeededTokenRanges);
repairState.setSkippedTokenRangesCount(collectedRepairStats.skippedTokenRanges);
repairState.setSkippedTablesCount(collectedRepairStats.skippedTables);
repairState.setNodeRepairTimeInSec((int) TimeUnit.MILLISECONDS.toSeconds(repairScheduleElapsedInMillis));
repairState.setNodeRepairTimeInSec((int) TimeUnit.MILLISECONDS.toSeconds(timeFunc.get() - startTimeInMillis));
long timeInHours = TimeUnit.SECONDS.toHours(repairState.getNodeRepairTimeInSec());
logger.info("Local {} repair time {} hour(s), stats: repairKeyspaceCount {}, " +
"repairTokenRangesSuccessCount {}, repairTokenRangesFailureCount {}, " +

8
test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerTest.java
View File

@ -48,6 +48,7 @@ import org.apache.cassandra.utils.FBUtilities;
import static org.apache.cassandra.schema.SchemaConstants.DISTRIBUTED_KEYSPACE_NAME;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.junit.Assert.assertEquals;
/**
@ -145,8 +146,11 @@ public class AutoRepairSchedulerTest extends TestBaseImpl
AutoRepair.SLEEP_IF_REPAIR_FINISHES_QUICKLY = new DurationSpec.IntSecondsBound("2s");
AutoRepairMetrics incrementalMetrics = AutoRepairMetricsManager.getMetrics(AutoRepairConfig.RepairType.INCREMENTAL);
// Since the AutoRepair sleeps up to SLEEP_IF_REPAIR_FINISHES_QUICKLY if the repair finishes quickly,
// so the "nodeRepairTimeInSec" metric should at least be greater than or equal to
// SLEEP_IF_REPAIR_FINISHES_QUICKLY
Util.spinAssert(String.format("%s: AutoRepair has not yet completed one INCREMENTAL repair cycle", broadcastAddress),
greaterThan(0L),
greaterThanOrEqualTo(2L),
() -> incrementalMetrics.nodeRepairTimeInSec.getValue().longValue(),
5,
TimeUnit.MINUTES);
@ -163,7 +167,7 @@ public class AutoRepairSchedulerTest extends TestBaseImpl
AutoRepairMetrics fullMetrics = AutoRepairMetricsManager.getMetrics(AutoRepairConfig.RepairType.FULL);
Util.spinAssert(String.format("%s: AutoRepair has not yet completed one FULL repair cycle", broadcastAddress),
greaterThan(0L),
greaterThanOrEqualTo(2L),
() -> fullMetrics.nodeRepairTimeInSec.getValue().longValue(),
5,
TimeUnit.MINUTES);