Merge branch 'master' into throttle-http-freno-aware

Shlomi Noach · web-flow · commit 81403699b786 · 2017-07-05T10:16:56.000+03:00
diff --git a/go/base/context.go b/go/base/context.go
@@ -47,6 +47,7 @@ const (
 
 const (
 	HTTPStatusOK = 200
+	maxBatchSize = 1000
 )
 
 var (
@@ -441,8 +442,8 @@ func (this *MigrationContext) SetDMLBatchSize(batchSize int64) {
 	if batchSize < 1 {
 		batchSize = 1
 	}
-	if batchSize > 100 {
-		batchSize = 100
+	if batchSize > maxBatchSize {
+		batchSize = maxBatchSize
 	}
 	atomic.StoreInt64(&this.DMLBatchSize, batchSize)
 }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ const (`
`47`	`47`
`48`	`48`	`const (`
`49`	`49`	`HTTPStatusOK = 200`
	`50`	`+ maxBatchSize = 1000`
`50`	`51`	`)`
`51`	`52`
`52`	`53`	`var (`
`@@ -441,8 +442,8 @@ func (this *MigrationContext) SetDMLBatchSize(batchSize int64) {`
`441`	`442`	`if batchSize < 1 {`
`442`	`443`	`batchSize = 1`
`443`	`444`	`}`
`444`		`- if batchSize > 100 {`
`445`		`- batchSize = 100`
	`445`	`+ if batchSize > maxBatchSize {`
	`446`	`+ batchSize = maxBatchSize`
`446`	`447`	`}`
`447`	`448`	`atomic.StoreInt64(&this.DMLBatchSize, batchSize)`
`448`	`449`	`}`