Merge pull request #19983 from enj/enj/i/fix_migrate_math

openshift-merge-robot · web-flow · commit 625768aee254 · 2018-06-18T06:56:14.000-07:00
Fix math division truncation in migrate storage
diff --git a/pkg/oc/admin/migrate/storage/storage.go b/pkg/oc/admin/migrate/storage/storage.go
@@ -373,5 +373,5 @@ func (t *tokenLimiter) getDuration(n int) time.Duration {
 // we use a burst value that scales linearly with the number of workers
 func newTokenLimiter(bandwidth, workers int) *tokenLimiter {
 	burst := 100 * kbToBytes * workers // 100 KB of burst per worker
-	return &tokenLimiter{burst: burst, rateLimiter: rate.NewLimiter(rate.Limit(bandwidth*mbToKB*kbToBytes/byteToBits), burst), nowFunc: time.Now}
+	return &tokenLimiter{burst: burst, rateLimiter: rate.NewLimiter(rate.Limit(bandwidth*mbToKB*kbToBytes)/byteToBits, burst), nowFunc: time.Now}
 }

Original file line number	Diff line number	Diff line change
`@@ -373,5 +373,5 @@ func (t *tokenLimiter) getDuration(n int) time.Duration {`
`373`	`373`	`// we use a burst value that scales linearly with the number of workers`
`374`	`374`	`func newTokenLimiter(bandwidth, workers int) *tokenLimiter {`
`375`	`375`	`burst := 100 * kbToBytes * workers // 100 KB of burst per worker`
`376`		`- return &tokenLimiter{burst: burst, rateLimiter: rate.NewLimiter(rate.Limit(bandwidthmbToKBkbToBytes/byteToBits), burst), nowFunc: time.Now}`
	`376`	`+ return &tokenLimiter{burst: burst, rateLimiter: rate.NewLimiter(rate.Limit(bandwidthmbToKBkbToBytes)/byteToBits, burst), nowFunc: time.Now}`
`377`	`377`	`}`