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.

Sign up for GitHub

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

executor: fix panic when execute change pump state #11730

Merged
merged 9 commits into from
Aug 22, 2019
Merged

executor: fix panic when execute change pump state #11730

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
012dbe3
fix panic when execute change pump state
WangXiangUSTC Aug 13, 2019
e569ad6
address comment
WangXiangUSTC Aug 14, 2019
fe35732
Merge branch 'master' into xiang/fix_panic
WangXiangUSTC Aug 14, 2019
4587eb8
Merge branch 'master' into xiang/fix_panic
suzaku Aug 15, 2019
3c7edfa
add unit test
WangXiangUSTC Aug 19, 2019
ba82e06
Merge branch 'xiang/fix_panic' of https://github.com/WangXiangUSTC/ti…
WangXiangUSTC Aug 19, 2019
53250ec
Merge branch 'master' into xiang/fix_panic
WangXiangUSTC Aug 22, 2019
eee8856
Merge branch 'master' into xiang/fix_panic
WangXiangUSTC Aug 22, 2019
6cc547b
Merge branch 'master' into xiang/fix_panic
WangXiangUSTC Aug 22, 2019
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
3 changes: 2 additions & 1 deletion executor/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ func (b *executorBuilder) buildCancelDDLJobs(v *plannercore.CancelDDLJobs) Execu

func (b *executorBuilder) buildChange(v *plannercore.Change) Executor {
return &ChangeExec{
ChangeStmt: v.ChangeStmt,
baseExecutor: newBaseExecutor(b.ctx, v.Schema(), v.ExplainID()),
ChangeStmt: v.ChangeStmt,
}
}

Expand Down
10 changes: 10 additions & 0 deletions executor/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,16 @@ func (s *testSuiteP1) TestChange(c *C) {
c.Assert(tk.ExecToErr("alter table t change c d varchar(100)"), NotNil)
}

func (s *testSuiteP1) TestChangePumpAndDrainer(c *C) {
tk := testkit.NewTestKit(c, s.store)
// change pump or drainer's state need connect to etcd
// so will meet error "URL scheme must be http, https, unix, or unixs: /tmp/tidb"
err := tk.ExecToErr("change pump to node_state ='paused' for node_id 'pump1'")
c.Assert(err, ErrorMatches, "URL scheme must be http, https, unix, or unixs.*")
err = tk.ExecToErr("change drainer to node_state ='paused' for node_id 'drainer1'")
c.Assert(err, ErrorMatches, "URL scheme must be http, https, unix, or unixs.*")
}

func (s *testSuiteP1) TestLoadStats(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
Expand Down