Browse Source

Merge branch 'master' into mq

pull/5890/head
chrislu 7 months ago
parent
commit
ba778539d9
  1. 1
      unmaintained/stress_filer_upload/bench_filer_upload/bench_filer_upload.go
  2. 1
      unmaintained/stress_filer_upload/stress_filer_upload_actual/stress_filer_upload.go
  3. 1
      weed/server/master_grpc_server.go
  4. 2
      weed/server/volume_grpc_client_to_master.go

1
unmaintained/stress_filer_upload/bench_filer_upload/bench_filer_upload.go

@ -66,6 +66,7 @@ func main() {
go func() { go func() {
ticker := time.NewTicker(1000 * time.Millisecond) ticker := time.NewTicker(1000 * time.Millisecond)
defer ticker.Stop()
var lastTime time.Time var lastTime time.Time
var counter, size int64 var counter, size int64

1
unmaintained/stress_filer_upload/stress_filer_upload_actual/stress_filer_upload.go

@ -72,6 +72,7 @@ func main() {
go func() { go func() {
ticker := time.NewTicker(500 * time.Millisecond) ticker := time.NewTicker(500 * time.Millisecond)
defer ticker.Stop()
var lastTime time.Time var lastTime time.Time
var counter, size int64 var counter, size int64

1
weed/server/master_grpc_server.go

@ -297,6 +297,7 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ
}() }()
ticker := time.NewTicker(5 * time.Second) ticker := time.NewTicker(5 * time.Second)
defer ticker.Stop()
for { for {
select { select {
case message := <-messageChan: case message := <-messageChan:

2
weed/server/volume_grpc_client_to_master.go

@ -159,7 +159,9 @@ func (vs *VolumeServer) doHeartbeat(masterAddress pb.ServerAddress, grpcDialOpti
} }
volumeTickChan := time.NewTicker(sleepInterval) volumeTickChan := time.NewTicker(sleepInterval)
defer volumeTickChan.Stop()
ecShardTickChan := time.NewTicker(17 * sleepInterval) ecShardTickChan := time.NewTicker(17 * sleepInterval)
defer ecShardTickChan.Stop()
dataCenter := vs.store.GetDataCenter() dataCenter := vs.store.GetDataCenter()
rack := vs.store.GetRack() rack := vs.store.GetRack()
ip := vs.store.Ip ip := vs.store.Ip

Loading…
Cancel
Save