From 962031b5248291f54544cffb42dfe6d81b80527b Mon Sep 17 00:00:00 2001 From: Emily Ye Date: Fri, 27 Dec 2019 11:32:11 -0800 Subject: [PATCH 1/2] reduce default batching interval --- third_party/terraform/utils/batcher.go | 2 +- .../website/docs/guides/provider_reference.html.markdown | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/third_party/terraform/utils/batcher.go b/third_party/terraform/utils/batcher.go index caa6b45958ab..9f1a0ecdcb9e 100644 --- a/third_party/terraform/utils/batcher.go +++ b/third_party/terraform/utils/batcher.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/errwrap" ) -const defaultBatchSendIntervalSec = 10 +const defaultBatchSendIntervalSec = 3 // RequestBatcher is a global batcher object that keeps track of // existing batches. diff --git a/third_party/terraform/website/docs/guides/provider_reference.html.markdown b/third_party/terraform/website/docs/guides/provider_reference.html.markdown index 35ef8546b2e2..b6de0b0b4e2b 100644 --- a/third_party/terraform/website/docs/guides/provider_reference.html.markdown +++ b/third_party/terraform/website/docs/guides/provider_reference.html.markdown @@ -110,7 +110,8 @@ Values are expected to include the version of the service, such as `https://www.googleapis.com/compute/v1/`. * `batching` - (Optional) This block controls batching GCP calls for groups of specific resource types. Structure is documented below. -~>**NOTE**: Batching is not implemented for the majority or resources/request types and is bounded by the core [`-parallelism`](https://www.terraform.io/docs/commands/apply.html#parallelism-n) flag. Adding or changing this config likely won't affect a Terraform run at all unless the user is creating enough of a particular type of resource to run into quota issues. +~>**NOTE**: Batching is not implemented for the majority or resources/request types and is bounded by two values. If you are running into issues with slow batches +resources, you may need to adjust one or both of 1) the core [`-parallelism`](https://www.terraform.io/docs/commands/apply.html#parallelism-n) flag, which controls how many concurrent resources are being operated on and 2) `send_after`, the time interval after which a batch is sent. * `request_timeout` - (Optional) A duration string controlling the amount of time the provider should wait for a single HTTP request. This will not adjust the @@ -120,7 +121,8 @@ timeout blocks for that. The `batching` fields supports: * `send_after` - (Optional) A duration string representing the amount of time -after which a request should be sent. Defaults to 10s. +after which a request should be sent. Defaults to 3s. Note that if you increase +`parallelism` you should also increase this value. * `enable_batching` - (Optional) Defaults to true. If false, disables batching so requests that have batching capabilities are instead is sent one by one. From 8e8640b19e593e79943fcefd4b9ff327a28588cb Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Sat, 28 Dec 2019 01:08:48 +0000 Subject: [PATCH 2/2] Update tracked submodules -> HEAD on Sat Dec 28 01:08:48 UTC 2019 Tracked submodules are build/terraform-beta build/terraform-mapper build/terraform build/ansible build/inspec. --- build/inspec | 2 +- build/terraform | 2 +- build/terraform-beta | 2 +- build/terraform-mapper | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/inspec b/build/inspec index 543613cd19c6..0788f0211735 160000 --- a/build/inspec +++ b/build/inspec @@ -1 +1 @@ -Subproject commit 543613cd19c6507614f1decd0047c59a29d5a30a +Subproject commit 0788f021173502bfe8e330f1941ad3b32eda2280 diff --git a/build/terraform b/build/terraform index 9188e8ca2e5f..861a4f3626c8 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit 9188e8ca2e5fdfc7c9e91e4c4b3a4185ead31d63 +Subproject commit 861a4f3626c84d15e55d0119ba0720e895f35ec7 diff --git a/build/terraform-beta b/build/terraform-beta index ebfc2298390e..376e08f135ed 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit ebfc2298390e245f87e798985579a39980c8049f +Subproject commit 376e08f135ed67c910e9c13bada9ebb596d629aa diff --git a/build/terraform-mapper b/build/terraform-mapper index a6e2bd9b5896..8bc57775de87 160000 --- a/build/terraform-mapper +++ b/build/terraform-mapper @@ -1 +1 @@ -Subproject commit a6e2bd9b5896c85b78c321a08b82a0225f7a5b6c +Subproject commit 8bc57775de87ce48c903464b35dadbcf5560a942