Skip to content

restore_data: remove wait apply phase#50316

Merged
ti-chi-bot[bot] merged 2 commits intopingcap:masterfrom
YuJuncen:remove-wait-apply
Jan 16, 2024
Merged

restore_data: remove wait apply phase#50316
ti-chi-bot[bot] merged 2 commits intopingcap:masterfrom
YuJuncen:remove-wait-apply

Conversation

@YuJuncen
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #50315, close #50312

Problem Summary:
See #50312

What changed and how does it work?

Removed the wait apply phase of restoring.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    (Will run regression test.)
  • No need to test
    • I checked and no code files have been changed.

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

YuJuncen and others added 2 commits January 11, 2024 15:07
Signed-off-by: Yu Juncen <yu745514916@live.com>
Signed-off-by: hillium <yujuncen@pingcap.com>
@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 11, 2024
@tiprow
Copy link

tiprow bot commented Jan 11, 2024

Hi @YuJuncen. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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/test-infra repository.

Copy link
Member

@overvenus overvenus left a comment

Choose a reason for hiding this comment

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

Do we need a version check?

@codecov
Copy link

codecov bot commented Jan 11, 2024

Codecov Report

Merging #50316 (ac48f9e) into master (e3abcbb) will decrease coverage by 14.3607%.
Report is 47 commits behind head on master.
The diff coverage is 0.0000%.

Additional details and impacted files
@@                Coverage Diff                @@
##             master     #50316         +/-   ##
=================================================
- Coverage   70.0692%   55.7085%   -14.3608%     
=================================================
  Files          1443       1557        +114     
  Lines        419903     592941     +173038     
=================================================
+ Hits         294223     330319      +36096     
- Misses       105398     239820     +134422     
- Partials      20282      22802       +2520     
Flag Coverage Δ
integration 37.2970% <0.0000%> (?)
unit 69.9897% <0.0000%> (-0.0796%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 54.0269% <ø> (ø)
parser ∅ <ø> (∅)
br 55.6578% <0.0000%> (+5.9338%) ⬆️

@YuJuncen
Copy link
Contributor Author

YuJuncen commented Jan 11, 2024

Do we need a version check?

Perhaps, but I will prefer no, or just reuse the global version checking of BR (Reject to restore to older versions but don't try to be compatible with them).

Also if I recall right the first released version of disk snapshot backup / recovery should be delivered with logical flashback. (bd081f1 introduces logical flashback, 181fb8e introduces the basic functionality, both to v5.4.0.)

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jan 16, 2024
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jan 16, 2024
@ti-chi-bot
Copy link

ti-chi-bot bot commented Jan 16, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-01-16 05:20:50.730189278 +0000 UTC m=+246892.294486981: ☑️ agreed by JmPotato.
  • 2024-01-16 05:29:25.893815322 +0000 UTC m=+247407.458113024: ☑️ agreed by overvenus.

@ti-chi-bot
Copy link

ti-chi-bot bot commented Jan 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BornChanger, JmPotato, overvenus

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:

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 added the approved label Jan 16, 2024
@ti-chi-bot
Copy link

ti-chi-bot bot commented Jan 16, 2024

@YuJuncen: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
idc-jenkins-ci-tidb/unit-test ac48f9e link unknown /test unit-test

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

@BornChanger
Copy link
Contributor

/retest

@tiprow
Copy link

tiprow bot commented Jan 16, 2024

@BornChanger: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

Details

In response to this:

/retest

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/test-infra repository.

@ti-chi-bot ti-chi-bot bot merged commit bf8d474 into pingcap:master Jan 16, 2024
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #50470.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jan 16, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #50472.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jan 16, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jan 16, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #50473.

ti-chi-bot bot pushed a commit that referenced this pull request Jan 17, 2024
@ti-chi-bot ti-chi-bot removed the needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. label Feb 5, 2024
YuJuncen added a commit to ti-chi-bot/tidb that referenced this pull request Feb 20, 2024
ti-chi-bot added a commit that referenced this pull request Feb 21, 2024
* This is an automated cherry-pick of #50316

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* resolved conflicts

Signed-off-by: Yu Juncen <yu745514916@live.com>

---------

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: Yu Juncen <yu745514916@live.com>
Co-authored-by: 山岚 <36239017+YuJuncen@users.noreply.github.com>
Co-authored-by: Yu Juncen <yu745514916@live.com>
@ti-chi-bot ti-chi-bot removed the needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. label Feb 23, 2024
guoshouyan pushed a commit to guoshouyan/tidb that referenced this pull request Mar 5, 2024
…pingcap#36)

close pingcap#50312, close pingcap#50315

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
@BornChanger BornChanger added needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. labels Apr 12, 2024
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request could not be created: failed to create pull request against pingcap/tidb#release-7.1 from head ti-chi-bot:cherry-pick-50316-to-release-7.1: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for ti-chi-bot:cherry-pick-50316-to-release-7.1."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request"}

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Apr 12, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: failed to apply #50316 on top of branch "release-7.5":

failed to git commit: exit status 1

@ti-chi-bot ti-chi-bot removed the needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. label Apr 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Disk snapshot recover stuck when there are some stale peers Remove wait_apply stage in disk snapshot restore

5 participants