Merge branch 'master' into save-goleveldb

Makefile

@@ -101,7 +101,6 @@ endif
 
 simulator:
 	CGO_ENABLED=0 go build -o bin/simulator cmd/simulator/main.go
-	bin/simulator
 
 gofail-enable:
 	# Converting gofail failpoints...

cmd/simulator/main.go

@@ -138,8 +138,12 @@ func initRaftLogger() {
 
 func simStart(pdAddr string, confName string, tickInterval time.Duration, clean ...server.CleanupFunc) {
 	start := time.Now()
-	driver := faketikv.NewDriver(pdAddr, confName)
-	err := driver.Prepare()
+	driver, err := faketikv.NewDriver(pdAddr, confName)
+	if err != nil {
+		simutil.Logger.Fatal("create driver error:", err)
+	}
+
+	err = driver.Prepare()
 	if err != nil {
 		simutil.Logger.Fatal("simulator prepare error:", err)
 	}

pkg/faketikv/cases/add_nodes_dynamic.go

@@ -54,7 +54,7 @@ func newAddNodesDynamic() *Conf {
 	conf.MaxID = id.maxID
 
 	numNodes := 8
-	e := &AddNodesDynamicInner{}
+	e := &AddNodesInner{}
 	e.Step = func(tick int64) uint64 {
 		if tick%100 == 0 && numNodes < 16 {
 			numNodes++

pkg/faketikv/cases/cases.go

@@ -22,7 +22,7 @@ import (
 type Store struct {
 	ID           uint64
 	Status       metapb.StoreState
-	Labels       []metapb.StoreLabel
+	Labels       []*metapb.StoreLabel
 	Capacity     uint64
 	Available    uint64
 	LeaderWeight float32
@@ -92,15 +92,3 @@ func NewConf(name string) *Conf {
 	}
 	return nil
 }
-
-// NeedSplit checks whether the region need to split according it's size
-// and number of keys.
-func (c *Conf) NeedSplit(size, rows int64) bool {
-	if c.RegionSplitSize != 0 && size >= c.RegionSplitSize {
-		return true
-	}
-	if c.RegionSplitKeys != 0 && rows >= c.RegionSplitKeys {
-		return true
-	}
-	return false
-}

pkg/faketikv/cases/event_inner.go

@@ -13,57 +13,57 @@
 
 package cases
 
-// EventInner is a detail template for custom events
+// EventInner is a detail template for custom events.
 type EventInner interface {
 	Type() string
 }
 
-// WriteFlowOnSpotInner writes bytes in some range
+// WriteFlowOnSpotInner writes bytes in some range.
 type WriteFlowOnSpotInner struct {
 	Step func(tick int64) map[string]int64
 }
 
-// Type implements the EventInner interface
+// Type implements the EventInner interface.
 func (w *WriteFlowOnSpotInner) Type() string {
 	return "write-flow-on-spot"
 }
 
-// WriteFlowOnRegionInner writes bytes in some region
+// WriteFlowOnRegionInner writes bytes in some region.
 type WriteFlowOnRegionInner struct {
 	Step func(tick int64) map[uint64]int64
 }
 
-// Type implements the EventInner interface
+// Type implements the EventInner interface.
 func (w *WriteFlowOnRegionInner) Type() string {
 	return "write-flow-on-region"
 }
 
-// ReadFlowOnRegionInner reads bytes in some region
+// ReadFlowOnRegionInner reads bytes in some region.
 type ReadFlowOnRegionInner struct {
 	Step func(tick int64) map[uint64]int64
 }
 
-// Type implements the EventInner interface
+// Type implements the EventInner interface.
 func (w *ReadFlowOnRegionInner) Type() string {
 	return "read-flow-on-region"
 }
 
-// AddNodesDynamicInner adds nodes dynamically
-type AddNodesDynamicInner struct {
+// AddNodesInner adds nodes.
+type AddNodesInner struct {
 	Step func(tick int64) uint64
 }
 
-// Type implements the EventInner interface
-func (w *AddNodesDynamicInner) Type() string {
-	return "add-nodes-dynamic"
+// Type implements the EventInner interface.
+func (w *AddNodesInner) Type() string {
+	return "add-nodes"
 }
 
-// DeleteNodesInner removes nodes randomly.
+// DeleteNodesInner removes nodes.
 type DeleteNodesInner struct {
 	Step func(tick int64) uint64
 }
 
-// Type implements the EventInner interface
+// Type implements the EventInner interface.
 func (w *DeleteNodesInner) Type() string {
 	return "delete-nodes"
 }

pkg/faketikv/conn.go

@@ -13,24 +13,40 @@
 
 package faketikv
 
-// Conn records the informations of connection among nodes.
-type Conn struct {
-	Nodes map[uint64]*Node
+import (
+	"github.com/pingcap/kvproto/pkg/metapb"
+	"github.com/pingcap/pd/pkg/faketikv/cases"
+)
+
+// Connection records the informations of connection among nodes.
+type Connection struct {
+	pdAddr string
+	Nodes  map[uint64]*Node
 }
 
-// NewConn returns a conn.
-func NewConn(nodes map[uint64]*Node) (*Conn, error) {
-	conn := &Conn{
-		Nodes: nodes,
+// NewConnection creates nodes according to the configuration and returns the connection among nodes.
+func NewConnection(conf *cases.Conf, pdAddr string) (*Connection, error) {
+	conn := &Connection{
+		pdAddr: pdAddr,
+		Nodes:  make(map[uint64]*Node),
+	}
+
+	for _, store := range conf.Stores {
+		node, err := NewNode(store, pdAddr)
+		if err != nil {
+			return nil, err
+		}
+		conn.Nodes[store.ID] = node
 	}
+
 	return conn, nil
 }
 
-func (c *Conn) nodeHealth(storeID uint64) bool {
+func (c *Connection) nodeHealth(storeID uint64) bool {
 	n, ok := c.Nodes[storeID]
 	if !ok {
 		return false
 	}
 
-	return n.GetState() == Up
+	return n.GetState() == metapb.StoreState_Up
 }