Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

etcd: fix json unmarshall error and sources not found after upgrade to 2.0.2 (#1635) #1649

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #1635

What problem does this PR solve?

part of #1636

Info struct changed in v2.0.2, but forgot to update etcd value.

close #1644
upgrade etcd before scheduler start

What is changed and how it works?

Try unmarshall and convert old info to new info if unmarshall error happened.
Try upgrade etcd key before scheduler start.

Check List

Tests

  • Unit test
  • upgrade test

@lance6716
Copy link
Collaborator

/lgtm

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lance6716

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added the status/LGT1 One reviewer already commented LGTM label May 6, 2021
@lance6716
Copy link
Collaborator

upgrade from V1 failed

E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?
  404  Not Found [IP: 151.101.210.132 80]

@lance6716
Copy link
Collaborator

but we already apt-get update, merge it anyway

@lance6716 lance6716 added the require-LGT1 for small PR, LGT1 is enough label May 6, 2021
@lance6716
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: ed92223

@ti-chi-bot ti-chi-bot merged commit 10b9f12 into pingcap:release-2.0 May 6, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants