Skip to content

Conversation

@hbisheng
Copy link
Contributor

@hbisheng hbisheng commented Jan 8, 2026

What problem does this PR solve?

Issue Number: ref #10222

Problem Summary:
When next-gen CMEK is enabled, raft logs and SST files can be encrypted by TiFlash proxy; the currently pinned tiflash-proxy-next-gen version can't recognize/read the encrypted data formats.

What is changed and how it works?

Bump submodule contrib/tiflash-proxy-next-gen to c013b172a259ccf11f23303097cd2b940f13e192 to pick up next-gen CMEK compatibility changes.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    • Verified that when CMEK is enabled and TiFlash is enabled, TiFlash proxy would crash due to InvalidChecksum or encryption_key is not found without this commit.
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

Summary by CodeRabbit

  • Chores
    • Updated internal submodule reference to maintain compatibility.

✏️ Tip: You can customize this high-level summary in your review settings.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jan 8, 2026

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 8, 2026
@coderabbitai
Copy link

coderabbitai bot commented Jan 8, 2026

📝 Walkthrough

Walkthrough

The pull request updates the contrib/tiflash-proxy-next-gen submodule reference to point to a newer commit. This is a dependency version bump with no changes to the codebase itself—only the submodule pointer is modified.

Changes

Cohort / File(s) Summary
Submodule Reference
contrib/tiflash-proxy-next-gen
Updated submodule commit reference from 2505f2f8d3061d8e61aa6f4ff4b91ade95a50785 to c013b172a259ccf11f23303097cd2b940f13e192

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

Poem

🐰 A submodule hopped to the next,
From one commit, to the text,
No code was changed, no logic bent,
Just pointers moved, time well spent! ✨

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Title check ✅ Passed The title 'tiflash-proxy-next-gen: bump for CMEK encrypted data' is clear, specific, and directly related to the main change—updating the submodule to support next-gen CMEK encryption.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Description check ✅ Passed The pull request description follows the template with all required sections completed: problem statement with issue reference, detailed explanation of changes with commit message, and comprehensive test/side-effects/documentation checklists.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing touches
  • 📝 Generate docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@pingcap-cla-assistant
Copy link

pingcap-cla-assistant bot commented Jan 8, 2026

CLA assistant check
All committers have signed the CLA.

Bump contrib/tiflash-proxy-next-gen to c013b172a259ccf11f23303097cd2b940f13e192 so that it can recognize the encrypted raft logs and SST files by next-gen CMEK.
@hbisheng hbisheng changed the title bump next gen proxy version to be cmek compatible tiflash-proxy-next-gen: bump for CMEK encrypted data Jan 22, 2026
@hbisheng hbisheng marked this pull request as ready for review January 22, 2026 03:16
@ti-chi-bot ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 22, 2026
@hbisheng
Copy link
Contributor Author

cc @JaySon-Huang

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Fix all issues with AI agents
In `@contrib/tiflash-proxy-next-gen`:
- Line 1: Add automated integration tests to cover CMEK-encrypted data
compatibility: implement tests named like TestTiFlashCMEK_RaftLogs and
TestTiFlashCMEK_SSTFiles to bring up a TiKV/TiFlash test cluster with CMEK
enabled and verify the TiFlash proxy (the proxy component under
contrib/tiflash-proxy-next-gen) can read encrypted raft logs and SST files, and
add TestTiFlash_NoCMEK_Backcompat to ensure non-CMEK deployments still work.
Hook these into the existing integration test harness (e.g., the package tests
or integration_test suite used by contrib/tiflash-proxy-next-gen), reuse helpers
that start a TiKV/TiFlash cluster and inject CMEK keys, and assert proxy startup
and successful reads of raft log entries and SST content; fail the test if the
proxy crashes or returns decryption errors. Ensure tests clean up keys/state and
can be toggled/skipped if CMEK environment (KMS) is unavailable.

@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jan 22, 2026
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jan 22, 2026
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jan 22, 2026

[LGTM Timeline notifier]

Timeline:

  • 2026-01-22 08:09:22.036418648 +0000 UTC m=+654189.650375494: ☑️ agreed by JaySon-Huang.
  • 2026-01-22 08:16:36.313764868 +0000 UTC m=+654623.927721714: ☑️ agreed by CalvinNeo.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jan 22, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CalvinNeo, JaySon-Huang, JinheLin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [CalvinNeo,JaySon-Huang,JinheLin]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@JaySon-Huang
Copy link
Contributor

/cherry-pick release-nextgen-20251011

@ti-chi-bot
Copy link
Member

@JaySon-Huang: once the present PR merges, I will cherry-pick it on top of release-nextgen-20251011 in the new PR and assign it to you.

Details

In response to this:

/cherry-pick release-nextgen-20251011

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot bot merged commit d269478 into pingcap:master Jan 22, 2026
8 checks passed
@ti-chi-bot
Copy link
Member

@JaySon-Huang: new pull request created to branch release-nextgen-20251011: #10672.

Details

In response to this:

/cherry-pick release-nextgen-20251011

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot bot pushed a commit that referenced this pull request Jan 23, 2026
ref #10222

Bump submodule contrib/tiflash-proxy-next-gen to c013b172a259ccf11f23303097cd2b940f13e192 to pick up next-gen CMEK compatibility changes.

Co-authored-by: Bisheng Huang <hbisheng@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants