*: make race with debug level (pingcap#1687)

* *: make race with debug level

* *: fix the problem of compatibility on the Mac

* ddl: pass make race

Makefile

@@ -7,8 +7,8 @@ endif
 
 path_to_add := $(addsuffix /bin,$(subst :,/bin:,$(GOPATH)))
 export PATH := $(path_to_add):$(PATH)
-
 GO        := GO15VENDOREXPERIMENT="1" go
+
 ARCH      := "`uname -s`"
 LINUX     := "Linux"
 MAC       := "Darwin"
@@ -97,12 +97,19 @@ test: gotest
 
 gotest:
 	rm -rf vendor && ln -s _vendor/vendor vendor
+	@export log_level=error;\
 	$(GO) test -cover $(PACKAGES)
 	rm -rf vendor
 
 race:
 	rm -rf vendor && ln -s _vendor/vendor vendor
-	$(GO) test --race $(PACKAGES)
+	@export log_level=debug; \
+	dirs=`go list ./... | grep -vE 'vendor' | awk '{sub("github.com/pingcap/tidb/",""); print}'`;\
+	for dir in $$dirs; do \
+		cd $$dir;\
+		go test -race | awk 'END{if($$1=="FAIL") {exit 1}}' || exit 1;\
+		cd -;\
+	done;
 	rm -rf vendor
 
 tikv_integration_test:

ddl/column_change_test.go

@@ -15,6 +15,7 @@ package ddl
 
 import (
 	"fmt"
+	"sync"
 
 	"github.com/juju/errors"
 	. "github.com/pingcap/check"
@@ -67,6 +68,7 @@ func (s *testColumnChangeSuite) TestColumnChange(c *C) {
 	err = ctx.CommitTxn()
 	c.Assert(err, IsNil)
 
+	var mu sync.Mutex
 	tc := &testDDLCallback{}
 	// set up hook
 	prevState := model.StateNone
@@ -98,6 +100,7 @@ func (s *testColumnChangeSuite) TestColumnChange(c *C) {
 				checkErr = errors.Trace(err)
 			}
 		case model.StatePublic:
+			mu.Lock()
 			publicTable, err = getCurrentTable(d, s.dbInfo.ID, tblInfo.ID)
 			if err != nil {
 				checkErr = errors.Trace(err)
@@ -106,14 +109,17 @@ func (s *testColumnChangeSuite) TestColumnChange(c *C) {
 			if err != nil {
 				checkErr = errors.Trace(err)
 			}
+			mu.Unlock()
 		}
 	}
 	d.hook = tc
 	defaultValue := int64(3)
 	job := testCreateColumn(c, ctx, d, s.dbInfo, tblInfo, "c3", &ast.ColumnPosition{Tp: ast.ColumnPositionNone}, defaultValue)
 	c.Assert(errors.ErrorStack(checkErr), Equals, "")
 	testCheckJobDone(c, d, job, true)
+	mu.Lock()
 	s.testColumnDrop(c, ctx, d, publicTable)
+	mu.Unlock()
 	s.testAddColumnNoDefault(c, ctx, d, tblInfo)
 	d.close()
 }

ddl/ddl_test.go

@@ -14,6 +14,7 @@
 package ddl_test
 
 import (
+	"os"
 	"testing"
 
 	"github.com/ngaut/log"
@@ -46,6 +47,7 @@ func (ts *testSuite) SetUpSuite(c *C) {
 }
 
 func init() {
-	log.SetLevelByString("warn")
+	logLevel := os.Getenv("log_level")
+	log.SetLevelByString(logLevel)
 	log.SetFlags(log.LstdFlags | log.Lmicroseconds | log.Lshortfile)
 }

executor/executor_test.go

@@ -16,6 +16,7 @@ package executor_test
 import (
 	"flag"
 	"fmt"
+	"os"
 	"strings"
 	"testing"
 	"time"
@@ -66,7 +67,8 @@ func (s *testSuite) SetUpSuite(c *C) {
 		c.Assert(err, IsNil)
 		s.store = store
 	}
-	log.SetLevelByString("warn")
+	logLevel := os.Getenv("log_level")
+	log.SetLevelByString(logLevel)
 	executor.BaseLookupTableTaskSize = 2
 }
 

privilege/privileges/privileges_test.go

@@ -15,6 +15,7 @@ package privileges_test
 
 import (
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/ngaut/log"
@@ -53,7 +54,8 @@ type testPrivilegeSuite struct {
 }
 
 func (s *testPrivilegeSuite) SetUpSuit(c *C) {
-	log.SetLevelByString("error")
+	logLevel := os.Getenv("log_level")
+	log.SetLevelByString(logLevel)
 }
 
 func (s *testPrivilegeSuite) SetUpTest(c *C) {

store/store_test.go

@@ -60,11 +60,11 @@ func (s *testKVSuite) SetUpSuite(c *C) {
 
 	cacheS, _ := tidb.NewStore(fmt.Sprintf("%s://%s", *testStore, *testStorePath))
 	c.Assert(cacheS, Equals, store)
-	log.SetLevelByString("warn")
+	logLevel := os.Getenv("log_level")
+	log.SetLevelByString(logLevel)
 }
 
 func (s *testKVSuite) TearDownSuite(c *C) {
-	log.SetLevelByString("debug")
 	err := s.s.Close()
 	c.Assert(err, IsNil)
 }

tidb_test.go

@@ -35,7 +35,8 @@ import (
 var store = flag.String("store", "memory", "registered store name, [memory, goleveldb, boltdb]")
 
 func TestT(t *testing.T) {
-	log.SetLevelByString("error")
+	logLevel := os.Getenv("log_level")
+	log.SetLevelByString(logLevel)
 	TestingT(t)
 }