split transfer region count

tools/pd-simulator/simulator/simutil/transfer_region_counter.go → tools/pd-analysis/transfer_region_counter.go

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package simutil
+package pdAnalysis
 
 import (
 	"fmt"
@@ -40,9 +40,9 @@ type TransferRegionCount struct {
 var TransferRegionCounter TransferRegionCount
 
 // Init for TransferRegionCount
-func (c *TransferRegionCount) Init() {
-	c.storeNum = CaseConfigure.StoreNum
-	c.regionNum = CaseConfigure.RegionNum
+func (c *TransferRegionCount) Init(storeNum, regionNum int) {
+	c.storeNum = storeNum
+	c.regionNum = regionNum
 	c.IsValid = true
 	c.Redundant = 0
 	c.Necessary = 0
@@ -73,7 +73,8 @@ func (c *TransferRegionCount) AddSource(regionID, sourceStoreID uint64) {
 		c.GraphMat[sourceStoreID][targetStoreID]++
 		delete(c.regionMap, regionID)
 	} else {
-		Logger.Fatal("Error in map")
+		fmt.Println("Error when add sourceStoreID %u with regionID %u in transfer region map", sourceStoreID, regionID)
+		os.Exit(-1)
 	}
 }
 
@@ -144,6 +145,11 @@ func (c *TransferRegionCount) PrintGraph() {
 
 // PrintResult will print result to log and csv file.
 func (c *TransferRegionCount) PrintResult() {
+	//Output log
+	fmt.Println("Total Schedules Graph: ")
+	c.PrintGraph()
+	//Solve data
+	c.Result()
 	//Output log
 	fmt.Println("Redundant Loop: ")
 	for index, value := range c.loopResultPath {

tools/pd-simulator/simulator/simutil/transfer_region_counter_test.go → tools/pd-analysis/transfer_region_counter_test.go

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package simutil
+package pdAnalysis
 
 import (
 	. "github.com/pingcap/check"
@@ -36,8 +36,7 @@ func (t *testCounterRedundantSuite) TestCounterRedundant(c *C) {
 			{0, 2, 3, 4, 0, 3, 0},
 			{0, 5, 9, 0, 0, 0, 0},
 			{0, 0, 8, 0, 0, 0, 0}}
-		InitCaseConfig(6, 3000, true)
-		TransferRegionCounter.Init()
+		TransferRegionCounter.Init(6, 3000)
 		c.Assert(TransferRegionCounter.Redundant, Equals, uint64(0))
 		c.Assert(TransferRegionCounter.Necessary, Equals, uint64(0))
 		TransferRegionCounter.GraphMat = test
@@ -54,8 +53,7 @@ func (t *testCounterRedundantSuite) TestCounterRedundant(c *C) {
 			{0, 0, 0, 0, 0, 0, 0},
 			{0, 1, 0, 0, 0, 0, 0},
 			{0, 0, 1, 0, 0, 0, 0}}
-		InitCaseConfig(6, 3000, true)
-		TransferRegionCounter.Init()
+		TransferRegionCounter.Init(6, 3000)
 		c.Assert(TransferRegionCounter.Redundant, Equals, uint64(0))
 		c.Assert(TransferRegionCounter.Necessary, Equals, uint64(0))
 		TransferRegionCounter.GraphMat = test
@@ -74,8 +72,7 @@ func (t *testCounterRedundantSuite) TestCounterRedundant(c *C) {
 			{0, 133, 0, 140, 0, 93, 0, 114, 0},
 			{0, 0, 48, 0, 84, 1, 48, 0, 20},
 			{0, 61, 2, 57, 7, 122, 1, 21, 0}}
-		InitCaseConfig(8, 3000, true)
-		TransferRegionCounter.Init()
+		TransferRegionCounter.Init(8, 3000)
 		c.Assert(TransferRegionCounter.Redundant, Equals, uint64(0))
 		c.Assert(TransferRegionCounter.Necessary, Equals, uint64(0))
 		TransferRegionCounter.GraphMat = test
@@ -87,8 +84,7 @@ func (t *testCounterRedundantSuite) TestCounterRedundant(c *C) {
 
 func (t *testCounterRedundantSuite) TestAddEdge(c *C) {
 	{
-		InitCaseConfig(6, 3000, true)
-		TransferRegionCounter.Init()
+		TransferRegionCounter.Init(6, 3000)
 		TransferRegionCounter.AddTarget(130, 3)
 		TransferRegionCounter.AddSource(130, 2)
 		c.Assert(TransferRegionCounter.GraphMat[2][3], Equals, uint64(1))

tools/pd-simulator/main.go

@@ -29,6 +29,7 @@ import (
 	"github.com/pingcap/pd/server/api"
 	"github.com/pingcap/pd/server/config"
 	"github.com/pingcap/pd/server/statistics"
+	"github.com/pingcap/pd/tools/pd-analysis"
 	"github.com/pingcap/pd/tools/pd-simulator/simulator"
 	"github.com/pingcap/pd/tools/pd-simulator/simulator/cases"
 	"github.com/pingcap/pd/tools/pd-simulator/simulator/simutil"
@@ -58,7 +59,7 @@ func main() {
 	simutil.InitCaseConfig(*storeNum, *regionNum, *enableTransferRegionCounter)
 	statistics.Denoising = false
 	if simutil.CaseConfigure.EnableTransferRegionCounter {
-		simutil.TransferRegionCounter.Init()
+		pdAnalysis.TransferRegionCounter.Init(simutil.CaseConfigure.StoreNum, simutil.CaseConfigure.RegionNum)
 	}
 
 	if *caseName == "" {
@@ -179,11 +180,8 @@ EXIT:
 
 	fmt.Printf("%s [%s] total iteration: %d, time cost: %v\n", simResult, simCase, driver.TickCount(), time.Since(start))
 	driver.PrintStatistics()
-	if simutil.TransferRegionCounter.IsValid {
-		simutil.Logger.Info("Total Schedules Graph: ")
-		simutil.TransferRegionCounter.PrintGraph()
-		simutil.TransferRegionCounter.Result()
-		simutil.TransferRegionCounter.PrintResult()
+	if pdAnalysis.TransferRegionCounter.IsValid {
+		pdAnalysis.TransferRegionCounter.PrintResult()
 	}
 
 	if simResult != "OK" {

tools/pd-simulator/simulator/task.go

@@ -21,7 +21,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/pd/server/core"
-	"github.com/pingcap/pd/tools/pd-simulator/simulator/simutil"
+	pdAnalysis "github.com/pingcap/pd/tools/pd-analysis"
 )
 
 // Task running in node.
@@ -336,8 +336,8 @@ func (a *removePeer) Step(r *RaftEngine) {
 			}
 		}
 		a.finished = true
-		if simutil.TransferRegionCounter.IsValid {
-			simutil.TransferRegionCounter.AddSource(a.regionID, a.peer.StoreId)
+		if pdAnalysis.TransferRegionCounter.IsValid {
+			pdAnalysis.TransferRegionCounter.AddSource(a.regionID, a.peer.StoreId)
 		}
 	}
 }
@@ -386,8 +386,8 @@ func (a *addLearner) Step(r *RaftEngine) {
 			r.schedulerStats.taskStats.incAddLeaner(region.GetID())
 		}
 		a.finished = true
-		if simutil.TransferRegionCounter.IsValid {
-			simutil.TransferRegionCounter.AddTarget(a.regionID, a.peer.StoreId)
+		if pdAnalysis.TransferRegionCounter.IsValid {
+			pdAnalysis.TransferRegionCounter.AddTarget(a.regionID, a.peer.StoreId)
 		}
 	}
 }