Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

simulator: adjust log file to tiup playground #5445

Merged
merged 1 commit into from Aug 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions tools/pd-simulator/main.go
Expand Up @@ -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")
Expand Down
16 changes: 15 additions & 1 deletion tools/pd-simulator/simulator/node.go
Expand Up @@ -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
Expand Down