Skip to content

branch-4.1: [fix](regression) handle cumulative delete-version compaction wait #64945#65316

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

Closed
github-actions wants to merge 1 commit into from
Closed

branch-4.1: [fix](regression) handle cumulative delete-version compaction wait #64945 #65316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 28 additions & 1 deletion regression-test/plugins/plugin_compaction.groovy
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,16 @@ Suite.metaClass.trigger_and_wait_compaction = { String table_name, String compac

// 3. wait all compaction finished
def running = triggered_tablets.size() > 0
def toLongOrNull = { value ->
if (value == null) {
return null
}
try {
return value.toString().trim().toLong()
} catch (Throwable ignored) {
return null
}
}
Awaitility.await().atMost(timeout_seconds, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).until(() -> {
for (tablet in triggered_tablets) {
def be_host = backendId_to_backendIP["${tablet.BackendId}"]
Expand All@@ -138,9 +148,26 @@ Suite.metaClass.trigger_and_wait_compaction = { String table_name, String compac
def tabletStatus = parseJson(stdout.trim())
def oldStatus = be_tablet_compaction_status.get("${be_host}-${tablet.TabletId}")
// last compaction success/failure time isn't updated, indicates compaction is not started(so we treat it as running and wait)
def handedOffToBaseCompactionAfterDeleteVersion = false
def completedByBaseCompactionAfterDeleteVersion = false
if (compaction_type == "cumulative") {
def oldCumulativePoint = toLongOrNull(oldStatus["cumulative point"])
def newCumulativePoint = toLongOrNull(tabletStatus["cumulative point"])
def lastCumulativeStatus = "${tabletStatus["last cumulative status"]}".toLowerCase()
def baseSuccessTimeChanged = oldStatus["last base success time"] != tabletStatus["last base success time"]
// E-2010 advances the cumulative point and lets base compaction handle delete-version rowsets.
handedOffToBaseCompactionAfterDeleteVersion = lastCumulativeStatus.contains("e-2010") &&
oldCumulativePoint != null && newCumulativePoint != null &&
newCumulativePoint > oldCumulativePoint
completedByBaseCompactionAfterDeleteVersion =

@github-actionsgithub-actionsBotJul 13, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The handoff case is not actually tied to the base compaction that should process the delete-version rowsets. This helper only triggers the requested type, so for trigger_and_wait_compaction(table, "cumulative") we can observe E-2010 plus an advanced cumulative point and then keep polling until the Awaitility timeout for last base success time to change when auto compaction is disabled; several callers set "disable_auto_compaction" = "true" and trigger base explicitly later (or not at all). The opposite race is also possible: any unrelated base compaction on the same tablet can change this timestamp and make the helper return without proving this handoff was handled. Please either treat the E-2010 cumulative-point advance as the terminal cumulative result, or explicitly trigger/wait the follow-up base compaction with a baseline taken after the handoff.

handedOffToBaseCompactionAfterDeleteVersion && baseSuccessTimeChanged
}
def success_time_unchanged = (oldStatus["last ${compaction_type} success time"] == tabletStatus["last ${compaction_type} success time"])
def failure_time_unchanged = (oldStatus["last ${compaction_type} failure time"] == tabletStatus["last ${compaction_type} failure time"])
running = running || (success_time_unchanged && failure_time_unchanged)
def currentCompactionTimestampChanged = !success_time_unchanged || !failure_time_unchanged
def compactionFinished = completedByBaseCompactionAfterDeleteVersion ||
(!handedOffToBaseCompactionAfterDeleteVersion && currentCompactionTimestampChanged)
running = running || !compactionFinished
if (running) {
logger.info("compaction is still running, be host: ${be_host}, tablet id: ${tablet.TabletId}, run status: ${compactionStatus.run_status}, old status: ${oldStatus}, new status: ${tabletStatus}")
return false
Expand Down
Loading