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.

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

error_code: re-format metafile #8870

Merged
merged 5 commits into from
Oct 22, 2020
Merged

Conversation

5kbpers
Copy link
Member

@5kbpers 5kbpers commented Oct 22, 2020

Signed-off-by: 5kbpers tangminghua@pingcap.com

What is changed and how it works?

Proposal: xxx

What's Changed:

Re-format metafile of error codes.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test

Release note

  • error_code: re-format metafile

@5kbpers 5kbpers requested review from lonng and sticnarf October 22, 2020 07:54
@5kbpers 5kbpers added the needs-cherry-pick-release-4.0 Type: Need cherry pick to release 4.0 label Oct 22, 2020
Signed-off-by: 5kbpers <tangminghua@pingcap.com>
Copy link
Member

@lonng lonng left a comment

Choose a reason for hiding this comment

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

LGTM
(The error code should be KV:xxx:yyy format, instead of KV-xxx-yyy)

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 22, 2020
Signed-off-by: 5kbpers <tangminghua@pingcap.com>
Signed-off-by: 5kbpers <tangminghua@pingcap.com>
["KV:Codec:Io"]
error = '''
KV:Codec:Io
'''
Copy link
Contributor

Choose a reason for hiding this comment

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

It is intended that there is a trailing newline?

Copy link
Member

Choose a reason for hiding this comment

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

It's OK, we can trim space when the tiup errdoc component loads them.

Copy link
Contributor

@sticnarf sticnarf left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Oct 22, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Oct 22, 2020
@5kbpers
Copy link
Member Author

5kbpers commented Oct 22, 2020

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 8852
  • 8856
  • 8852
  • 8852
  • 8835

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 22, 2020
@5kbpers
Copy link
Member Author

5kbpers commented Oct 22, 2020

Your auto merge job has been accepted, waiting for:

  • 8852
  • 8856
  • 8852
  • 8852
  • 8835

Wow

@sticnarf
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 8852
  • 8856
  • 8852
  • 8852
  • 8835

Wow

It's code freeze day!

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@5kbpers merge failed.

@sticnarf
Copy link
Contributor

@5kbpers merge failed.

Seems like a CI environment issue.

@sticnarf
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 8871

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@5kbpers merge failed.

@5kbpers
Copy link
Member Author

5kbpers commented Oct 22, 2020

/merge

@5kbpers 5kbpers added this to the v4.0.8 milestone Oct 22, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@5kbpers merge failed.

@5kbpers
Copy link
Member Author

5kbpers commented Oct 22, 2020

/run-all-tests

@sticnarf
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit 8c7d117 into tikv:master Oct 22, 2020
ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request Oct 22, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #8877

5kbpers pushed a commit that referenced this pull request Oct 23, 2020
* cherry pick #8870 to release-4.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* resolve conflicts

Signed-off-by: 5kbpers <tangminghua@pingcap.com>

Co-authored-by: 5kbpers <tangminghua@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-4.0 Type: Need cherry pick to release 4.0 status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants