cmd: fix err check (#22986)

pingcap · Mar 1, 2021 · 93d3c04 · 93d3c04
1 parent e1004a2
commit 93d3c04
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/cmd/ddltest/ddl_test.go b/cmd/ddltest/ddl_test.go
@@ -97,11 +97,11 @@ type TestDDLSuite struct {
 }
 
 func (s *TestDDLSuite) SetUpSuite(c *C) {
-	logutil.InitLogger(&logutil.LogConfig{Config: zaplog.Config{Level: *logLevel}})
+	err := logutil.InitLogger(&logutil.LogConfig{Config: zaplog.Config{Level: *logLevel}})
+	c.Assert(err, IsNil)
 
 	s.quit = make(chan struct{})
 
-	var err error
 	s.store, err = store.New(fmt.Sprintf("tikv://%s%s", *etcd, *tikvPath))
 	c.Assert(err, IsNil)
 
@@ -304,7 +304,11 @@ func (s *TestDDLSuite) startServer(i int, fp *os.File) (*server, error) {
 		}
 		log.Warnf("ping addr %v failed, retry count %d err %v", addr, i, err)
 
-		db.Close()
+		err = db.Close()
+		if err != nil {
+			log.Warnf("close db failed, retry count %d err %v", i, err)
+			break
+		}
 		time.Sleep(sleepTime)
 		sleepTime += sleepTime
 	}

diff --git a/cmd/ddltest/index_test.go b/cmd/ddltest/index_test.go
@@ -64,7 +64,8 @@ func (s *TestDDLSuite) checkAddIndex(c *C, indexInfo *model.IndexInfo) {
 	txn, err := ctx.Txn(false)
 	c.Assert(err, IsNil)
 	defer func() {
-		txn.Rollback()
+		err = txn.Rollback()
+		c.Assert(err, IsNil)
 	}()
 
 	it, err := idx.SeekFirst(txn)
@@ -103,7 +104,10 @@ func (s *TestDDLSuite) checkDropIndex(c *C, indexInfo *model.IndexInfo) {
 	c.Assert(err, IsNil)
 	txn, err := ctx.Txn(false)
 	c.Assert(err, IsNil)
-	defer txn.Rollback()
+	defer func(){
+		err := txn.Rollback()
+		c.Assert(err, IsNil)
+	}()
 
 	it, err := idx.SeekFirst(txn)
 	c.Assert(err, IsNil)