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

ddl: fix inappropriate schema state output by admin show ddl jobs #33850

Merged
merged 3 commits into from
Apr 11, 2022

Conversation

tangenta
Copy link
Contributor

@tangenta tangenta commented Apr 11, 2022

What problem does this PR solve?

Issue Number: close #24420, related to #23494

Problem Summary:

The information "queueing" is introduced by pingcap/parser#1210.

state-none has two meanings:

  • one for adding-type DDL, the job hasn't started yet / the job has been rollbacked.
  • one for removed-type DDL, the job hasn't started yet / the job has done.

What is changed and how it works?

This PR picks up the work from #31544.

Before this PR:

+--------+---------+------------+---------------+----------------------+-----------+----------+-----------+---------------------+---------------------+---------------------+---------+
| JOB_ID | DB_NAME | TABLE_NAME | JOB_TYPE      | SCHEMA_STATE         | SCHEMA_ID | TABLE_ID | ROW_COUNT | CREATE_TIME         | START_TIME          | END_TIME            | STATE   |
+--------+---------+------------+---------------+----------------------+-----------+----------+-----------+---------------------+---------------------+---------------------+---------+
|    166 | sbtest  | sbtest1    | add index     | write reorganization |       160 |      162 |         0 | 2022-04-11 14:47:10 | 2022-04-11 14:47:10 | NULL                | running |
|    167 | sbtest2 | sbtest1    | add index     | queueing             |       158 |      164 |         0 | 2022-04-11 14:47:10 | NULL                | NULL                | none    |

After this PR:

mysql> admin show ddl jobs;
+--------+---------+------------+---------------+----------------------+-----------+----------+-----------+---------------------+---------------------+---------------------+----------+
| JOB_ID | DB_NAME | TABLE_NAME | JOB_TYPE      | SCHEMA_STATE         | SCHEMA_ID | TABLE_ID | ROW_COUNT | CREATE_TIME         | START_TIME          | END_TIME            | STATE    |
+--------+---------+------------+---------------+----------------------+-----------+----------+-----------+---------------------+---------------------+---------------------+----------+
|    154 | sbtest  | sbtest1    | add index     | write reorganization |       146 |      150 |    230400 | 2022-04-11 14:24:59 | 2022-04-11 14:24:59 | NULL                | running  |
|    155 | sbtest2 | sbtest1    | add index     | none                 |       148 |      152 |         0 | 2022-04-11 14:25:00 | NULL                | NULL                | queueing |

Basically, there are 2 changes:

  • There is no "queueing" SCHEMA_STATE anymore. Even if the job is in the queue, the SCHEMA_STATE is "none".
  • The state "queueing" has been added to the STATE column. It is used to distinguish whether a job is waiting in the DDL queue.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)

See the result above.

  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

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

Fix an issue that the schema state output by 'admin show ddl jobs' is inappropriate.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 11, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • wjhuang2016
  • 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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 11, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Apr 11, 2022

Copy link
Member

@wjhuang2016 wjhuang2016 left a comment

Choose a reason for hiding this comment

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

What's the manual test and its result?

ddl/ddl_worker.go Outdated Show resolved Hide resolved
@tangenta
Copy link
Contributor Author

tangenta commented Apr 11, 2022

@wjhuang2016 I have updated the manual test result. The difference is shown in the last column.

@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 11, 2022
Copy link
Contributor

@zimulala zimulala 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-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 11, 2022
@zimulala
Copy link
Contributor

Please add Release note for this PR.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Apr 11, 2022
@easonn7
Copy link

easonn7 commented Apr 11, 2022

LGTM

@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 Apr 11, 2022
@tangenta
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f059d56

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

@tangenta: 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 67b0734 into pingcap:master Apr 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note Denotes a PR that will be considered when it comes time to generate release notes. 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
Development

Successfully merging this pull request may close these issues.

ddl: the schema state is not appropriate for some removed-type ddl
6 participants