Merge pull request #291 from m-lab/tweaks

gfr10598 · web-flow · commit 6c79cd1a6262 · 2017-10-24T17:03:12.000-04:00
Tweak num workers and remove bad log msg.
diff --git a/bq/insert.go b/bq/insert.go
@@ -257,7 +257,6 @@ func (in *BQInserter) Flush() error {
 		// This is heavyweight, and may run forever without a context deadline.
 		ctx, _ := context.WithTimeout(context.Background(), in.timeout)
 		err = in.uploader.Put(ctx, in.rows)
-		log.Println(err)
 		if err == nil || !strings.Contains(err.Error(), "Quota exceeded:") {
 			break
 		}
diff --git a/cmd/etl_worker/app-ndt.yaml b/cmd/etl_worker/app-ndt.yaml
@@ -37,7 +37,7 @@ network:
     - 9090/tcp
 
 env_variables:
-  MAX_WORKERS: 20
+  MAX_WORKERS: 12
   BIGQUERY_PROJECT: 'mlab-sandbox'
   BIGQUERY_DATASET: 'mlab_sandbox'
   ANNOTATE_IP: 'true'

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,6 @@ func (in *BQInserter) Flush() error {`
`257`	`257`	`// This is heavyweight, and may run forever without a context deadline.`
`258`	`258`	`ctx, _ := context.WithTimeout(context.Background(), in.timeout)`
`259`	`259`	`err = in.uploader.Put(ctx, in.rows)`
`260`		`- log.Println(err)`
`261`	`260`	`if err == nil \|\| !strings.Contains(err.Error(), "Quota exceeded:") {`
`262`	`261`	`break`
`263`	`262`	`}`