Skip to content

Commit fc64a73

Browse files
Oreoxmtti-chi-bot
authored andcommitted
This is an automated cherry-pick of pingcap#11441
Signed-off-by: ti-chi-bot <[email protected]>
1 parent 8cd4b0a commit fc64a73

File tree

2 files changed

+66
-3
lines changed

2 files changed

+66
-3
lines changed

dm/dm-manage-source.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ help operate-source
3232
```
3333

3434
```
35-
`create`/`update`/`stop`/`show` upstream MySQL/MariaDB source.
35+
`create`/`stop`/`show` upstream MySQL/MariaDB source.
3636
3737
Usage:
3838
dmctl operate-source <operate-type> [config-file ...] [--print-sample-config] [flags]
@@ -49,8 +49,6 @@ Global Flags:
4949

5050
+ `create`:创建一个或多个上游的数据库源。创建多个数据源失败时,会尝试回滚到执行命令之前的状态
5151

52-
+ `update`:更新一个上游的数据库源
53-
5452
+ `stop`:停止一个或多个上游的数据库源。停止多个数据源失败时,可能有部分数据源已成功停止
5553

5654
+ `show`:显示已添加的数据源以及对应的 DM-worker

dm/dmctl-introduction.md

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Usage:
4040
dmctl [command]
4141
4242
Available Commands:
43+
<<<<<<< HEAD
4344
check-task Checks the configuration file of the task.
4445
config Commands to import/export config.
4546
get-config Gets the configuration.
@@ -60,6 +61,31 @@ Available Commands:
6061
start-task Starts a task as defined in the configuration file.
6162
stop-task Stops a specified task.
6263
unlock-ddl-lock Unlocks DDL lock forcefully.
64+
=======
65+
binlog manage or show binlog operations
66+
binlog-schema manage or show table schema in schema tracker
67+
check-task Checks the configuration file of the task
68+
config manage config operations
69+
decrypt Decrypts cipher text to plain text
70+
encrypt Encrypts plain text to cipher text
71+
help Gets help about any command
72+
list-member Lists member information
73+
offline-member Offlines member which has been closed
74+
operate-leader `evict`/`cancel-evict` the leader
75+
operate-source `create`/`stop`/`show` upstream MySQL/MariaDB source
76+
pause-relay Pauses DM-worker's relay unit
77+
pause-task Pauses a specified running task or all (sub)tasks bound to a source
78+
purge-relay Purges relay log files of the DM-worker according to the specified filename
79+
query-status Queries task status
80+
resume-relay Resumes DM-worker's relay unit
81+
resume-task Resumes a specified paused task or all (sub)tasks bound to a source
82+
shard-ddl-lock maintain or show shard-ddl locks information
83+
start-relay Starts workers pulling relay log for a source
84+
start-task Starts a task as defined in the configuration file
85+
stop-relay Stops workers pulling relay log for a source
86+
stop-task Stops a specified task or all (sub)tasks bound to a source
87+
transfer-source Transfers a upstream MySQL/MariaDB source to a free worker
88+
>>>>>>> 556086613 (Remove the `operate-source update` command (#11441))
6389
6490
Flags:
6591
-h, --help help for dmctl
@@ -90,6 +116,7 @@ export DM_MASTER_ADDR="172.16.30.14:8261"
90116

91117
```
92118
Available Commands:
119+
<<<<<<< HEAD
93120
check-task check-task <config-file> [--error count] [--warn count]
94121
config commands to import/export config
95122
get-config get-config <task | master | worker | source> <name> [--file filename]
@@ -122,4 +149,42 @@ Global Options:
122149
--ssl-ca Path of file that contains list of trusted SSL CAs for connection.
123150
--ssl-cert Path of file that contains X509 certificate in PEM format for connection.
124151
--ssl-key Path of file that contains X509 key in PEM format for connection.
152+
=======
153+
binlog manage or show binlog operations
154+
binlog-schema manage or show table schema in schema tracker
155+
check-task Checks the configuration file of the task
156+
config manage config operations
157+
decrypt Decrypts cipher text to plain text
158+
encrypt Encrypts plain text to cipher text
159+
help Gets help about any command
160+
list-member Lists member information
161+
offline-member Offlines member which has been closed
162+
operate-leader `evict`/`cancel-evict` the leader
163+
operate-source `create`/`stop`/`show` upstream MySQL/MariaDB source
164+
pause-relay Pauses DM-worker's relay unit
165+
pause-task Pauses a specified running task or all (sub)tasks bound to a source
166+
purge-relay Purges relay log files of the DM-worker according to the specified filename
167+
query-status Queries task status
168+
resume-relay Resumes DM-worker's relay unit
169+
resume-task Resumes a specified paused task or all (sub)tasks bound to a source
170+
shard-ddl-lock maintain or show shard-ddl locks information
171+
start-relay Starts workers pulling relay log for a source
172+
start-task Starts a task as defined in the configuration file
173+
stop-relay Stops workers pulling relay log for a source
174+
stop-task Stops a specified task or all (sub)tasks bound to a source
175+
transfer-source Transfers a upstream MySQL/MariaDB source to a free worker
176+
177+
Flags:
178+
--config string Path to config file.
179+
-h, --help help for dmctl
180+
--master-addr string Master API server address, this parameter is required when interacting with the dm-master
181+
--rpc-timeout string RPC timeout, default is 10m. (default "10m")
182+
-s, --source strings MySQL Source ID.
183+
--ssl-ca string Path of file that contains list of trusted SSL CAs for connection.
184+
--ssl-cert string Path of file that contains X509 certificate in PEM format for connection.
185+
--ssl-key string Path of file that contains X509 key in PEM format for connection.
186+
-V, --version Prints version and exit.
187+
188+
Use "dmctl [command] --help" for more information about a command.
189+
>>>>>>> 556086613 (Remove the `operate-source update` command (#11441))
125190
```

0 commit comments

Comments
 (0)