*: fix batch insert test data race (pingcap#2968)

Use atomic functions to access limit variable.
zengchunyun · Mar 30, 2017 · 992f367 · 992f367
1 parent aa8298e
commit 992f367
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/executor/write_test.go b/executor/write_test.go
@@ -16,6 +16,7 @@ package executor_test
 import (
 	"errors"
 	"fmt"
+	"sync/atomic"
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/tidb/ast"
@@ -853,16 +854,16 @@ func makeLoadDataInfo(column int, ctx context.Context, c *C) (ld *executor.LoadD
 }
 
 func (s *testSuite) TestBatchInsert(c *C) {
-	originLimit := kv.TxnEntryCountLimit
+	originLimit := atomic.LoadUint64(&kv.TxnEntryCountLimit)
 	originBatch := executor.BatchInsertSize
 	defer func() {
 		s.cleanEnv(c)
 		testleak.AfterTest(c)()
-		kv.TxnEntryCountLimit = originLimit
+		atomic.StoreUint64(&kv.TxnEntryCountLimit, originLimit)
 		executor.BatchInsertSize = originBatch
 	}()
 	// Set the limitation to a small value, make it easier to reach the limitation.
-	kv.TxnEntryCountLimit = 100
+	atomic.StoreUint64(&kv.TxnEntryCountLimit, 100)
 	executor.BatchInsertSize = 50
 	tk := testkit.NewTestKit(c, s.store)
 	tk.MustExec("use test")

diff --git a/kv/kv.go b/kv/kv.go
@@ -40,7 +40,7 @@ var (
 	// The limit of single entry size (len(key) + len(value)).
 	TxnEntrySizeLimit = 6 * 1024 * 1024
 	// The limit of number of entries in the MemBuffer.
-	TxnEntryCountLimit = 300 * 1000
+	TxnEntryCountLimit uint64 = 300 * 1000
 	// The limit of the sum of all entry size.
 	TxnTotalSizeLimit = 100 * 1024 * 1024
 )

diff --git a/kv/memdb_buffer.go b/kv/memdb_buffer.go
@@ -16,6 +16,8 @@
 package kv
 
 import (
+	"sync/atomic"
+
 	"github.com/juju/errors"
 	"github.com/pingcap/goleveldb/leveldb"
 	"github.com/pingcap/goleveldb/leveldb/comparer"
@@ -28,7 +30,7 @@ import (
 type memDbBuffer struct {
 	db              *memdb.DB
 	entrySizeLimit  int
-	bufferLenLimit  int
+	bufferLenLimit  uint64
 	bufferSizeLimit int
 }
 
@@ -42,7 +44,7 @@ func NewMemDbBuffer() MemBuffer {
 	return &memDbBuffer{
 		db:              memdb.New(comparer.DefaultComparer, 4*1024),
 		entrySizeLimit:  TxnEntrySizeLimit,
-		bufferLenLimit:  TxnEntryCountLimit,
+		bufferLenLimit:  atomic.LoadUint64(&TxnEntryCountLimit),
 		bufferSizeLimit: TxnTotalSizeLimit,
 	}
 }
@@ -92,7 +94,7 @@ func (m *memDbBuffer) Set(k Key, v []byte) error {
 	if m.Size() > m.bufferSizeLimit {
 		return ErrTxnTooLarge.Gen("transaction too large, size:%d", m.Size())
 	}
-	if m.Len() > m.bufferLenLimit {
+	if m.Len() > int(m.bufferLenLimit) {
 		return ErrTxnTooLarge.Gen("transaction too large, len:%d", m.Len())
 	}
 	return errors.Trace(err)

diff --git a/store/tikv/2pc.go b/store/tikv/2pc.go
@@ -17,6 +17,7 @@ import (
 	"bytes"
 	"math"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/coreos/etcd/pkg/monotime"
@@ -123,7 +124,8 @@ func newTwoPhaseCommitter(txn *tikvTxn) (*twoPhaseCommitter, error) {
 			size += len(lockKey)
 		}
 	}
-	if len(keys) > kv.TxnEntryCountLimit || size > kv.TxnTotalSizeLimit {
+	entrylimit := atomic.LoadUint64(&kv.TxnEntryCountLimit)
+	if len(keys) > int(entrylimit) || size > kv.TxnTotalSizeLimit {
 		return nil, kv.ErrTxnTooLarge
 	}
 	const logEntryCount = 10000