Skip to content

compact-log-backup: pick some of fixs of restoring.#19258

Merged
YuJuncen merged 4 commits intotikv:release-8.5-20251126-v8.5.4from
YuJuncen:hotfix-tmp
Dec 31, 2025
Merged

compact-log-backup: pick some of fixs of restoring.#19258
YuJuncen merged 4 commits intotikv:release-8.5-20251126-v8.5.4from
YuJuncen:hotfix-tmp

Conversation

@YuJuncen
Copy link
Contributor

@YuJuncen YuJuncen commented Dec 31, 2025

What is changed and how it works?

Issue Number: N/A

What's Changed:

Picked #19229, #19240 and #18313

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

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

Release note

Leavrth and others added 4 commits December 31, 2025 18:03
@Leavrth @YuJuncen
sst_importer: set fill cache to false when merge downloaded SST files (…
67467df 
…tikv#19229)

close tikv#19228

set fill cache to false when merge downloaded SST files

Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>
@YuJuncen
sst_importer: ensure cleanup of temporary files on error (tikv#19240)
994a8ce 
ref tikv#17283, close tikv#19239

sst_importer: enhance failpoint handling and ensure cleanup of temporary files on error

- Ensure temporary files are cleaned up when a download fails in sst_importer
- Add a new failpoint `download_files_ext_after_download` to inject errors right after batch downloads complete, improving test coverage of cleanup paths

Signed-off-by: Juncen Yu <yujuncen@pingcap.com>
@YuJuncen
Squashed commit of the following:
bdcf350 
commit 5a14b2b
Author: Juncen Yu <yujuncen@pingcap.com>
Date:   Mon Dec 29 15:11:06 2025 +0800

    make clippy happy

    Signed-off-by: Juncen Yu <yujuncen@pingcap.com>

commit ace595e
Merge: bd5bff3 147cacc
Author: Juncen Yu <yujuncen@pingcap.com>
Date:   Fri Dec 26 17:51:36 2025 +0800

    Merge branch 'master' of https://github.com/tikv/tikv into resolve-compact-conflict

commit bd5bff3
Merge: fde14ce 301984c
Author: Juncen Yu <yujuncen@pingcap.com>
Date:   Mon Dec 22 12:10:59 2025 +0800

    Merge branch 'master' of https://github.com/tikv/tikv into resolve-compact-conflict

    Signed-off-by: Juncen Yu <yujuncen@pingcap.com>

commit fde14ce
Author: Juncen Yu <yujuncen@pingcap.com>
Date:   Tue Mar 18 15:44:06 2025 +0800

    added more checks

    Signed-off-by: Juncen Yu <yujuncen@pingcap.com>

commit d0801cb
Author: Juncen Yu <yujuncen@pingcap.com>
Date:   Tue Mar 18 15:27:14 2025 +0800

    added more case about collapsed rollback

    Signed-off-by: Juncen Yu <yujuncen@pingcap.com>

commit 6d2b994
Author: Juncen Yu <yujuncen@pingcap.com>
Date:   Tue Mar 18 14:52:40 2025 +0800

    compact-log-backup: try to resolve conflict encountering during compacting

    Signed-off-by: Juncen Yu <yujuncen@pingcap.com>

Signed-off-by: Juncen Yu <yujuncen@pingcap.com>
@LykxSassinator @YuJuncen
*: upgrade cargo-deny version to make it compatible to further develo…
196497f 
…pments.

Signed-off-by: lucasliang <nkcs_lykx@hotmail.com>
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 31, 2025

Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

Details

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 kubernetes-sigs/prow repository.

@ti-chi-bot ti-chi-bot bot added dco-signoff: yes Indicates the PR's author has signed the dco. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 31, 2025
@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 31, 2025
@ti-chi-bot ti-chi-bot bot added the lgtm label Dec 31, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 31, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: 3pointer, Leavrth
Once this PR has been reviewed and has the lgtm label, please assign tonyxuqqi for approval. For more information see the Code Review Process.
Please ensure that each of them provides their approval before proceeding.

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

Details Needs approval from an approver in each of these files:

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

@ti-chi-bot ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 31, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 31, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-12-31 10:15:53.923942631 +0000 UTC m=+178909.742251063: ☑️ agreed by Leavrth.
  • 2025-12-31 10:30:45.287269524 +0000 UTC m=+179801.105577946: ☑️ agreed by 3pointer.

@YuJuncen YuJuncen merged commit f006964 into tikv:release-8.5-20251126-v8.5.4 Dec 31, 2025
2 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@3pointer 3pointer 3pointer approved these changes

@Leavrth Leavrth Leavrth approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

dco-signoff: yes Indicates the PR's author has signed the dco. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. lgtm size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@YuJuncen @3pointer @Leavrth @LykxSassinator