Skip to content

fix cdc watermark add failure handling#25925

Merged
mergify[bot] merged 3 commits into
matrixorigin:mainfrom
jiangxinmeng1:fix-cdc-watermark-add-failure
Jul 21, 2026
Merged

fix cdc watermark add failure handling#25925
mergify[bot] merged 3 commits into
matrixorigin:mainfrom
jiangxinmeng1:fix-cdc-watermark-add-failure

Merge branch 'main' into fix-cdc-watermark-add-failure

f887897
Select commit
Loading
Failed to load commit list.
Mergify / Mergify Merge Queue succeeded Jul 21, 2026 in 1h 30m 41s

Merged via merge queue

  • Entered queue2026-07-21 08:46 UTC · Rule: main · triggered by @jiangxinmeng1 with the merge queue checkbox
  • Checks passed · in-place
  • Merged2026-07-21 10:17 UTC · at f8878973e944c31e4508d49cb1d47d108914c2bd · squash

This pull request spent 1 hour 30 minutes 39 seconds in the queue, including 57 minutes 54 seconds running CI.

Required conditions to merge
  • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
  • github-review-approved [🛡 GitHub branch protection] (documentation)
  • github-review-decision = APPROVED [🛡 GitHub branch protection] (documentation)
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone Compose CI / multi cn e2e bvt test docker compose(PESSIMISTIC)
    • check-neutral = Matrixone Compose CI / multi cn e2e bvt test docker compose(PESSIMISTIC)
    • check-skipped = Matrixone Compose CI / multi cn e2e bvt test docker compose(PESSIMISTIC)
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone Standlone CI / Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
    • check-neutral = Matrixone Standlone CI / Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
    • check-skipped = Matrixone Standlone CI / Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH, PESSIMISTIC)
    • check-neutral = Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH, PESSIMISTIC)
    • check-skipped = Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH, PESSIMISTIC)
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone CI / UT Test on Ubuntu/x86
    • check-neutral = Matrixone CI / UT Test on Ubuntu/x86
    • check-skipped = Matrixone CI / UT Test on Ubuntu/x86
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone Utils CI / Coverage
    • check-neutral = Matrixone Utils CI / Coverage
    • check-skipped = Matrixone Utils CI / Coverage
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone CI / SCA Test on Linux/arm64
    • check-neutral = Matrixone CI / SCA Test on Linux/arm64
    • check-skipped = Matrixone CI / SCA Test on Linux/arm64