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

feat: add get-config command #1323

Merged
merged 18 commits into from
Dec 18, 2020
Merged

feat: add get-config command #1323

merged 18 commits into from
Dec 18, 2020

Conversation

GMHDBJD
Copy link
Collaborator

@GMHDBJD GMHDBJD commented Dec 3, 2020 •
edited
Loading

What problem does this PR solve?

use get-config command to get task/worker/master/source cfg.

What is changed and how it works?

  • refine get-task-config to support merge from subtask
  • get worker/master/source cfg

Check List

Tests

  • Unit test
  • Integration test

@GMHDBJD GMHDBJD added priority/normal Minor change, requires approval from ≥1 primary reviewer status/WIP This PR is still work in progress needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated needs-cherry-pick-release-2.0 This PR should be cherry-picked to release-2.0. Remove this label after cherry-picked to release-2.0 labels Dec 3, 2020
@GMHDBJD GMHDBJD added status/PTAL This PR is ready for review. Add this label back after committing new changes and removed status/WIP This PR is still work in progress labels Dec 7, 2020
@csuzhangxc csuzhangxc added this to the v2.0.1 milestone Dec 10, 2020
@GMHDBJD
Copy link
Collaborator Author

GMHDBJD commented Dec 14, 2020

/run-all-tests

lance6716
lance6716 reviewed Dec 14, 2020
View reviewed changes
Copy link
Collaborator

@lance6716 lance6716 left a comment

Choose a reason for hiding this comment

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

will review later 😭

dm/ctl/master/get_config.go Outdated Show resolved Hide resolved
dm/ctl/ctl.go Show resolved Hide resolved
dm/master/scheduler/scheduler.go Show resolved Hide resolved
@csuzhangxc csuzhangxc added the needs-update-docs Should update docs after this PR is merged. Remove this label once the docs are updated label Dec 14, 2020
csuzhangxc
csuzhangxc reviewed Dec 14, 2020
View reviewed changes
chaos/cases/task.go Outdated Show resolved Hide resolved
@csuzhangxc csuzhangxc mentioned this pull request Dec 14, 2020
Open
lance6716
lance6716 reviewed Dec 17, 2020
View reviewed changes
Copy link
Collaborator

@lance6716 lance6716 left a comment

Choose a reason for hiding this comment

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

will review later

cmd/dm-ctl/main.go Show resolved Hide resolved
dm/config/task.go Show resolved Hide resolved
dm/config/task.go Show resolved Hide resolved
dm/config/task_test.go Outdated Show resolved Hide resolved
lance6716
lance6716 reviewed Dec 17, 2020
View reviewed changes
tests/dmctl_basic/check_list/get_config.sh
"\"result\": true" 3

# restart master with get config
ps aux | grep dm-master |awk '{print $2}'|xargs kill || true
Copy link
Collaborator

Choose a reason for hiding this comment

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

we might try killall (not sure it's supported in CI, it's OK not changing)

tests/dmctl_basic/conf/dm-master.toml Show resolved Hide resolved
lance6716
lance6716 reviewed Dec 17, 2020
View reviewed changes
Copy link
Collaborator

@lance6716 lance6716 left a comment

Choose a reason for hiding this comment

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

rest LGTM

dm/master/server.go Outdated Show resolved Hide resolved
csuzhangxc
csuzhangxc reviewed Dec 18, 2020
View reviewed changes
Copy link
Member

@csuzhangxc csuzhangxc left a comment

Choose a reason for hiding this comment

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

LGTM

@csuzhangxc csuzhangxc 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 Dec 18, 2020
@GMHDBJD GMHDBJD mentioned this pull request Dec 18, 2020
Merged
7 tasks
lance6716
lance6716 approved these changes Dec 18, 2020
View reviewed changes
Copy link
Collaborator

@lance6716 lance6716 left a comment

Choose a reason for hiding this comment

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

LGTM

@lance6716 lance6716 added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Dec 18, 2020
@GMHDBJD GMHDBJD merged commit e791594 into pingcap:master Dec 18, 2020
@GMHDBJD GMHDBJD deleted the getConfig branch December 18, 2020 08:05
ti-srebot pushed a commit to ti-srebot/dm that referenced this pull request Dec 18, 2020
@GMHDBJD @ti-srebot
cherry pick pingcap#1323 to release-2.0
38aae74 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 18, 2020
Merged
2 tasks
@ti-srebot
Copy link

cherry pick to release-2.0 in PR #1348

@ti-srebot ti-srebot added already-cherry-pick-2.0 The related PR is already cherry-picked to release-2.0. Add this label once the PR is cherry-picked and removed needs-cherry-pick-release-2.0 This PR should be cherry-picked to release-2.0. Remove this label after cherry-picked to release-2.0 labels Dec 18, 2020
csuzhangxc pushed a commit that referenced this pull request Dec 21, 2020
@ti-srebot @GMHDBJD
feat: add get-config command (#1323) (#1348)
3754a46 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: GMHDBJD <35025882+GMHDBJD@users.noreply.github.com>
Co-authored-by: gmhdbjd <gmhdbjd@gmail.com>
@ti-srebot ti-srebot mentioned this pull request Dec 25, 2020
Merged
7 tasks
@lance6716 lance6716 added already-update-docs The docs related to this PR already updated. Add this label once the docs are updated and removed needs-update-docs Should update docs after this PR is merged. Remove this label once the docs are updated labels Dec 25, 2020
@Ehco1996 Ehco1996 mentioned this pull request Sep 28, 2021
Merged
@ti-chi-bot ti-chi-bot mentioned this pull request Oct 8, 2021
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@csuzhangxc csuzhangxc csuzhangxc left review comments

@lance6716 lance6716 lance6716 approved these changes

Assignees
No one assigned
Labels
already-cherry-pick-2.0 The related PR is already cherry-picked to release-2.0. Add this label once the PR is cherry-picked already-update-docs The docs related to this PR already updated. Add this label once the docs are updated needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated priority/normal Minor change, requires approval from ≥1 primary reviewer status/LGT2 Two reviewers already commented LGTM, ready for merge
Projects
None yet
Milestone
v2.0.1
Development

Successfully merging this pull request may close these issues.
4 participants
@GMHDBJD @ti-srebot @lance6716 @csuzhangxc