Skip to content
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

Jump to bottom

add commitTS in column for restore #2926

Merged
merged 10 commits into from
Jul 17, 2020
Merged

add commitTS in column for restore #2926

merged 10 commits into from
Jul 17, 2020

Conversation

lichunzhu
Copy link
Contributor

@lichunzhu lichunzhu commented Jul 14, 2020 •
edited
Loading

What problem does this PR solve?

supplement of #2899, add commitTS info in restore

What is changed and how does it work?

add commitTS column, append backupErr when setTiKVGCTime is failed to avoid err lost.

Check List

Tests

  • Unit test
  • E2E test
  • Stability test
  • Manual test (add detailed scripts or steps below)
    test get restore and backup
$ kubectl get backup basic-backup -n demo  
NAME           BACKUPPATH                                     BACKUPSIZE   COMMITTS             AGE
basic-backup   s3://chunzhu/backup-2020-07-14T10:21:45Z.tgz   3.9 kB       418046831785148417   71m
$ kubectl get restore basic-restore -n demo
NAME            STARTED                COMPLETED              COMMITTS             AGE
basic-restore   2020-07-14T10:23:30Z   2020-07-14T10:23:33Z   418046831785148417   70m

Code changes

  • Has Go code change

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Does this PR introduce a user-facing change?:

add commitTS info column in `get restore` command

@lichunzhu lichunzhu added the status/PTAL PR needs to be reviewed label Jul 14, 2020
@lichunzhu lichunzhu requested review from cofyc and DanielZhangQD July 14, 2020 11:35
cofyc
cofyc previously approved these changes Jul 14, 2020
View reviewed changes
@cofyc
Copy link
Contributor

cofyc commented Jul 15, 2020

/run-all-tests

cofyc
cofyc previously approved these changes Jul 15, 2020
View reviewed changes
DanielZhangQD
DanielZhangQD approved these changes Jul 16, 2020
View reviewed changes
Copy link
Contributor

@DanielZhangQD DanielZhangQD left a comment

Choose a reason for hiding this comment

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

LGTM

@DanielZhangQD
Copy link
Contributor

/test pull-e2e-kind

@DanielZhangQD DanielZhangQD merged commit 4480cbb into pingcap:master Jul 17, 2020
ti-srebot pushed a commit to ti-srebot/tidb-operator that referenced this pull request Jul 17, 2020
@lichunzhu @ti-srebot
cherry pick pingcap#2926 to release-1.1
5d948aa 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jul 17, 2020
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-1.1 in PR #2970

ti-srebot added a commit that referenced this pull request Jul 17, 2020
@ti-srebot @lichunzhu
add commitTS in column for restore (#2926) (#2970)
a77eb19 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Chunzhu Li <lichunzhu@stu.xjtu.edu.cn>
@lichunzhu lichunzhu deleted the addRestoreCommitTsColumn branch September 2, 2020 07:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ti-srebot ti-srebot ti-srebot approved these changes

@DanielZhangQD DanielZhangQD DanielZhangQD approved these changes

@cofyc cofyc cofyc approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-1.1 status/LGT2 status/PTAL PR needs to be reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lichunzhu @cofyc @DanielZhangQD @ti-srebot