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

sessionctx: fix err check #23000

Merged
merged 9 commits into from
Mar 17, 2021
Merged

sessionctx: fix err check #23000

merged 9 commits into from
Mar 17, 2021

Conversation

Tjianke
Copy link
Contributor

@Tjianke Tjianke commented Feb 28, 2021 •
edited
Loading

What problem does this PR solve?

Issue Number: #22979

Problem Summary:

What is changed and how it works?

What's Changed: added err check

Check List

Tests

  • Unit test
  • Integration test

Release note

  • No release note

@ti-chi-bot ti-chi-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 28, 2021
@Tjianke Tjianke marked this pull request as ready for review February 28, 2021 02:36
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 28, 2021
zimulala
zimulala reviewed Mar 1, 2021
View reviewed changes
sessionctx/variable/varsutil_test.go Outdated
SetSessionSystemVar(v, TiDBDDLReorgWorkerCount, types.NewIntDatum(int64(maxDDLReorgWorkerCount)+1))
er := SetSessionSystemVar(v, TiDBDDLReorgWorkerCount, types.NewIntDatum(int64(maxDDLReorgWorkerCount)+1))
c.Assert(er, IsNil)
// shouldn't this assert tests for result from line 284
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can remove line285-286, and we can use err instead of er.

Copy link
Contributor Author

@Tjianke Tjianke Mar 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

After removing line285-286 and rename er to err, c.Assert(terror.ErrorEqual(err, ErrWrongValueForVar), IsTrue) raises error, not sure if I should change to IsFalse or fix the test, since this line originally checks for err in line 281.

Copy link
Contributor

@zimulala zimulala Mar 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I file #23017. I think we can add a // FIXME: issue #23017 here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixme added.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 4, 2021
@zimulala
Copy link
Contributor

/LGTM

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • djshow832
  • zimulala

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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 16, 2021
@zimulala
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 0bd5401df706ecc6decda06411f5defea30a77e2

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 16, 2021
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Mar 16, 2021
@Tjianke
Copy link
Contributor Author

Tjianke commented Mar 16, 2021

Update tests after #23017 fixed.

@xhebox
Copy link
Contributor

xhebox commented Mar 17, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 5001e15

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 17, 2021
@ti-chi-bot
Copy link
Member

@Tjianke: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit bb12864 into pingcap:master Mar 17, 2021
SabaPing pushed a commit to SabaPing/tidb that referenced this pull request Mar 25, 2021
@Tjianke @SabaPing
sessionctx: fix err check (pingcap#23000)
14fe233
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zimulala zimulala zimulala left review comments

@djshow832 djshow832 djshow832 approved these changes

Assignees
No one assigned
Labels
size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Tjianke @zimulala @ti-chi-bot @xhebox @djshow832