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

fix ci #12097

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix ci #12097

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/dm-master/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
)

func main() {
// 1. parse config
// 1. parse config.
cfg := master.NewConfig()
err := cfg.Parse(os.Args[1:])
switch errors.Cause(err) {
Expand Down
2 changes: 1 addition & 1 deletion dm/tests/openapi/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,7 @@ function test_tls() {
# miss pd all certificate
openapi_task_check "create_noshard_task_with_security_failed" $task_name \
"$(cat $cur/tls_conf/ca2.pem)" "$(cat $cur/tls_conf/tidb.pem)" "$(cat $cur/tls_conf/tidb.key)" \
"" "" ""
"" "" "123"

killall -9 tidb-server 2>/dev/null || true
killall -9 tikv-server 2>/dev/null || true
Expand Down
1 change: 1 addition & 0 deletions dm/unit/unit.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ type Unit interface {
// every unit does base initialization in `Init`, and this must pass before start running the subtask
// other setups can be done in the beginning of `Process`, but this should be treated carefully to make it
// compatible with Pause / Resume.
//
// if initialing successfully, the outer caller should call `Close` when the unit (or the task) finished, stopped or canceled (because other units Init fail).
// if initialing fail, Init itself should release resources it acquired before (rolling itself back).
Init(ctx context.Context) error
Expand Down
Loading