ddl: delete should skip ErrNotExist error.

2015-11-23 16:47:22 +08:00
parent cfed1736a4
commit e4b8a64df4
1 changed files with 3 additions and 1 deletions
--- a/ddl/reorg.go
+++ b/ddl/reorg.go
@ -23,6 +23,7 @@ import (
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/meta"
 	"github.com/pingcap/tidb/model"
+	"github.com/pingcap/tidb/terror"
 )

 var _ context.Context = &reorgContext{}
@ -183,7 +184,8 @@ func (d *ddl) delKeysWithPrefix(prefix string) error {

 			for _, key := range keys {
 				err := txn.Delete([]byte(key))
-				if err != nil {
+				// must skip ErrNotExist
+				if err != nil && !terror.ErrorEqual(err, kv.ErrNotExist) {
 					return errors.Trace(err)
 				}
 			}