Unverified Commit a0b0db63 authored by Anton Evangelatov's avatar Anton Evangelatov Committed by GitHub

cmd/swarm: use resetting timer to measure fetch time (#18474)

parent 632135ce
...@@ -125,30 +125,28 @@ func uploadAndSync(c *cli.Context) error { ...@@ -125,30 +125,28 @@ func uploadAndSync(c *cli.Context) error {
for { for {
start := time.Now() start := time.Now()
err := fetch(hash, endpoint, fhash, ruid) err := fetch(hash, endpoint, fhash, ruid)
fetchTime := time.Since(start)
if err != nil { if err != nil {
continue continue
} }
metrics.GetOrRegisterMeter("upload-and-sync.single.fetch-time", nil).Mark(int64(fetchTime)) metrics.GetOrRegisterResettingTimer("upload-and-sync.single.fetch-time", nil).UpdateSince(start)
wg.Done() wg.Done()
return return
} }
}(endpoints[randIndex], ruid) }(endpoints[randIndex], ruid)
} else { } else {
for _, endpoint := range endpoints { for _, endpoint := range endpoints[1:] {
ruid := uuid.New()[:8] ruid := uuid.New()[:8]
wg.Add(1) wg.Add(1)
go func(endpoint string, ruid string) { go func(endpoint string, ruid string) {
for { for {
start := time.Now() start := time.Now()
err := fetch(hash, endpoint, fhash, ruid) err := fetch(hash, endpoint, fhash, ruid)
fetchTime := time.Since(start)
if err != nil { if err != nil {
continue continue
} }
metrics.GetOrRegisterMeter("upload-and-sync.each.fetch-time", nil).Mark(int64(fetchTime)) metrics.GetOrRegisterResettingTimer("upload-and-sync.each.fetch-time", nil).UpdateSince(start)
wg.Done() wg.Done()
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment