ddl: fix invailid ddl job panic (pingcap#7940)

crazycs520 · Oct 19, 2018 · 74b8cf9 · 74b8cf9
1 parent 6c50eba
commit 74b8cf9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/ddl/ddl_worker.go b/ddl/ddl_worker.go
@@ -399,7 +399,7 @@ func (d *ddl) runDDLJob(t *meta.Meta, job *model.Job) (ver int64, err error) {
  default:
  // Invalid job, cancel it.
  job.State = model.JobStateCancelled
- err = errInvalidDDLJob.Gen("invalid ddl job %v", job)
+ err = errInvalidDDLJob.Gen("invalid ddl job type: %v", job.Type)
  }
 
  // Save errors in job, so that others can know errors happened.

diff --git a/ddl/ddl_worker_test.go b/ddl/ddl_worker_test.go
@@ -277,6 +277,24 @@ func (s *testDDLSuite) TestTableError(c *C) {
 
 }
 
+func (s *testDDLSuite) TestInvalidDDLJob(c *C) {
+ store := testCreateStore(c, "test_invalid_ddl_job_type_error")
+ defer store.Close()
+ d := testNewDDL(context.Background(), nil, store, nil, nil, testLease)
+ defer d.Stop()
+ ctx := testNewContext(d)
+
+ job := &model.Job{
+ SchemaID: 0,
+ TableID: 0,
+ Type: model.ActionNone,
+ BinlogInfo: &model.HistoryInfo{},
+ Args: []interface{}{},
+ }
+ err := d.doDDLJob(ctx, job)
+ c.Assert(err.Error(), Equals, "[ddl:3]invalid ddl job type: none")
+}
+
 func (s *testDDLSuite) TestForeignKeyError(c *C) {
  store := testCreateStore(c, "test_foreign_key_error")
  defer store.Close()