From 1661fcb46294fc6096a84d43bddddac3cb534d97 Mon Sep 17 00:00:00 2001 From: bufferflies <1045931706@qq.com> Date: Fri, 19 Aug 2022 12:29:04 +0800 Subject: [PATCH] log file and level Signed-off-by: bufferflies <1045931706@qq.com> --- tools/pd-simulator/main.go | 6 +++--- tools/pd-simulator/simulator/node.go | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/pd-simulator/main.go b/tools/pd-simulator/main.go index 496551b90b0..a8ae5732c31 100644 --- a/tools/pd-simulator/main.go +++ b/tools/pd-simulator/main.go @@ -45,9 +45,9 @@ var ( pdAddr = flag.String("pd", "", "pd address") configFile = flag.String("config", "conf/simconfig.toml", "config file") caseName = flag.String("case", "", "case name") - serverLogLevel = flag.String("serverLog", "fatal", "pd server log level") - simLogLevel = flag.String("simLog", "fatal", "simulator log level") - simLogFile = flag.String("simLogFile", "", "simulator log file") + serverLogLevel = flag.String("serverLog", "info", "pd server log level") + simLogLevel = flag.String("simLog", "info", "simulator log level") + simLogFile = flag.String("log-file", "", "simulator log file") regionNum = flag.Int("regionNum", 0, "regionNum of one store") storeNum = flag.Int("storeNum", 0, "storeNum") enableTransferRegionCounter = flag.Bool("enableTransferRegionCounter", false, "enableTransferRegionCounter") diff --git a/tools/pd-simulator/simulator/node.go b/tools/pd-simulator/simulator/node.go index 136fbeb3ba9..8c0ea15fec3 100644 --- a/tools/pd-simulator/simulator/node.go +++ b/tools/pd-simulator/simulator/node.go @@ -72,7 +72,21 @@ func NewNode(s *cases.Store, pdAddr string, ioRate int64) (*Node, error) { }, } tag := fmt.Sprintf("store %d", s.ID) - client, receiveRegionHeartbeatCh, err := NewClient(pdAddr, tag) + var ( + client Client + receiveRegionHeartbeatCh <-chan *pdpb.RegionHeartbeatResponse + err error + ) + + // Client should wait if PD server is not ready. + for i := 0; i < maxInitClusterRetries; i++ { + client, receiveRegionHeartbeatCh, err = NewClient(pdAddr, tag) + if err == nil { + break + } + time.Sleep(time.Second) + } + if err != nil { cancel() return nil, err