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

dmctl: refine commands' usage text #296

Merged
merged 8 commits into from
Sep 25, 2019

Conversation

csuzhangxc
Copy link
Member

What problem does this PR solve?

refine dmctl comands' usage text

What is changed and how it works?

refine usage suggestion from I18N team in pingcap/docs-cn#1878.

Check List

Tests

  • Manual test (add detailed scripts or steps below)
    1. run dmctl
    2. observe the output of usage

Related changes

  • Need to cherry-pick to the release branch

@csuzhangxc csuzhangxc added priority/unimportant Really minor change, requires approval from secondary reviewers status/PTAL This PR is ready for review. Add this label back after committing new changes type/enhancement Performance improvement or refactoring needs-cherry-pick-release-1.0 This PR should be cherry-picked to release-1.0. Remove this label after cherry-picked to release-1.0 labels Sep 24, 2019
@codecov
Copy link

codecov bot commented Sep 24, 2019

Codecov Report

Merging #296 into master will increase coverage by 0.0135%.
The diff coverage is n/a.

@@               Coverage Diff                @@
##             master       #296        +/-   ##
================================================
+ Coverage   60.2407%   60.2542%   +0.0135%     
================================================
  Files           134        134                
  Lines         14789      14789                
================================================
+ Hits           8909       8911         +2     
+ Misses         5043       5042         -1     
+ Partials        837        836         -1

@csuzhangxc
Copy link
Member Author

@amyangfei @WangXiangUSTC PTAL

Copy link
Contributor

@WangXiangUSTC WangXiangUSTC left a comment

Choose a reason for hiding this comment

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

LGTM

@WangXiangUSTC WangXiangUSTC added status/LGT1 One reviewer already commented LGTM and removed status/PTAL This PR is ready for review. Add this label back after committing new changes labels Sep 25, 2019
Copy link
Contributor

@amyangfei amyangfei left a comment

Choose a reason for hiding this comment

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

@csuzhangxc
Copy link
Member Author

will all output be changed to DM-worker, such as
https://github.com/pingcap/dm/blob/master/dm/ctl/master/break_ddl_lock.go#L54

sounds good. should we need to changed to DM-worker for error class?

@amyangfei
Copy link
Contributor

amyangfei commented Sep 25, 2019

will all output be changed to DM-worker, such as
https://github.com/pingcap/dm/blob/master/dm/ctl/master/break_ddl_lock.go#L54

sounds good. should we need to changed to DM-worker for error class?

I feel ok to change to DM-worker in error class, but it is still hard to change all dm-worker to DM-worker, such as variable name used in the config file. What about your opinion @GregoryIan @WangXiangUSTC

@csuzhangxc
Copy link
Member Author

@amyangfei changed to DM-worker for dmctl's command direct output, but not change other places in da2793e.

other places including:

  • error class
  • log
  • some output in DM-ansible

amyangfei
amyangfei previously approved these changes Sep 25, 2019
Copy link
Contributor

@amyangfei amyangfei left a comment

Choose a reason for hiding this comment

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

LGTM

BTW I prefer to keep dm-worker in error class name, log, which is more tidy.
Comparing
[code=40066:class=dm-worker:scope=internal:level=high] ExecuteDDL timeout, try use query-status to query whether the DDL is still blocking
[code=40066:class=DM-worker:scope=internal:level=high] ExecuteDDL timeout, try use query-status to query whether the DDL is still blocking

@amyangfei amyangfei added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Sep 25, 2019
@csuzhangxc csuzhangxc merged commit ce5e038 into pingcap:master Sep 25, 2019
@csuzhangxc csuzhangxc deleted the dmctl-refine-usage branch September 25, 2019 10:13
csuzhangxc added a commit to csuzhangxc/dm that referenced this pull request Sep 25, 2019
@csuzhangxc csuzhangxc added already-cherry-pick-1.0 The related PR is already cherry-picked to release-1.0. Add this label once the PR is cherry-picked and removed needs-cherry-pick-release-1.0 This PR should be cherry-picked to release-1.0. Remove this label after cherry-picked to release-1.0 labels Sep 26, 2019
lichunzhu pushed a commit to lichunzhu/dm that referenced this pull request Apr 6, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
already-cherry-pick-1.0 The related PR is already cherry-picked to release-1.0. Add this label once the PR is cherry-picked priority/unimportant Really minor change, requires approval from secondary reviewers status/LGT2 Two reviewers already commented LGTM, ready for merge type/enhancement Performance improvement or refactoring
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants