From fa2448e47c2523894c9f0429a04516e7e503064f Mon Sep 17 00:00:00 2001 From: Song Wang Date: Wed, 14 Jun 2017 15:58:58 -0700 Subject: [PATCH 1/2] update gapic retry config --- .../datastore/src/v1/datastore_client_config.json | 4 +--- .../dlp/src/v2beta1/dlp_service_client_config.json | 4 +--- .../src/v1beta2/language_service_client_config.json | 4 +--- .../src/v2/logging_service_v2_client_config.json | 6 +++--- .../src/v3/group_service_client_config.json | 4 +--- .../src/v3/metric_service_client_config.json | 4 +--- packages/pubsub/src/v1/publisher_client_config.json | 5 +++++ .../pubsub/src/v1/subscriber_client_config.json | 13 ++++++++++--- packages/spanner/src/v1/spanner_client_config.json | 4 +--- packages/speech/src/v1/speech_client_config.json | 6 ++---- .../video_intelligence_service_client_config.json | 4 +--- .../src/v1/image_annotator_client_config.json | 4 +--- 12 files changed, 28 insertions(+), 34 deletions(-) diff --git a/packages/datastore/src/v1/datastore_client_config.json b/packages/datastore/src/v1/datastore_client_config.json index b1b0ac63e94..84ac96e10dc 100644 --- a/packages/datastore/src/v1/datastore_client_config.json +++ b/packages/datastore/src/v1/datastore_client_config.json @@ -6,9 +6,7 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [ - "UNAVAILABLE" - ] + "non_idempotent": [] }, "retry_params": { "default": { diff --git a/packages/dlp/src/v2beta1/dlp_service_client_config.json b/packages/dlp/src/v2beta1/dlp_service_client_config.json index 0e7d58accfe..6d7f18ff782 100644 --- a/packages/dlp/src/v2beta1/dlp_service_client_config.json +++ b/packages/dlp/src/v2beta1/dlp_service_client_config.json @@ -6,9 +6,7 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [ - "UNAVAILABLE" - ] + "non_idempotent": [] }, "retry_params": { "default": { diff --git a/packages/language/src/v1beta2/language_service_client_config.json b/packages/language/src/v1beta2/language_service_client_config.json index e394406ed24..8018f8a7bbf 100644 --- a/packages/language/src/v1beta2/language_service_client_config.json +++ b/packages/language/src/v1beta2/language_service_client_config.json @@ -6,9 +6,7 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [ - "UNAVAILABLE" - ] + "non_idempotent": [] }, "retry_params": { "default": { diff --git a/packages/logging/src/v2/logging_service_v2_client_config.json b/packages/logging/src/v2/logging_service_v2_client_config.json index 3dc284718e2..2b364fec9a8 100644 --- a/packages/logging/src/v2/logging_service_v2_client_config.json +++ b/packages/logging/src/v2/logging_service_v2_client_config.json @@ -39,9 +39,9 @@ "retry_codes_name": "non_idempotent", "retry_params_name": "default", "bundling": { - "element_count_threshold": 100, - "request_byte_threshold": 1024, - "delay_threshold_millis": 10 + "element_count_threshold": 1000, + "request_byte_threshold": 1048576, + "delay_threshold_millis": 50 } }, "ListLogEntries": { diff --git a/packages/monitoring/src/v3/group_service_client_config.json b/packages/monitoring/src/v3/group_service_client_config.json index 825193b3a41..a57878c2ece 100644 --- a/packages/monitoring/src/v3/group_service_client_config.json +++ b/packages/monitoring/src/v3/group_service_client_config.json @@ -6,9 +6,7 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [ - "UNAVAILABLE" - ] + "non_idempotent": [] }, "retry_params": { "default": { diff --git a/packages/monitoring/src/v3/metric_service_client_config.json b/packages/monitoring/src/v3/metric_service_client_config.json index b04f7227700..15f82ab1547 100644 --- a/packages/monitoring/src/v3/metric_service_client_config.json +++ b/packages/monitoring/src/v3/metric_service_client_config.json @@ -6,9 +6,7 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [ - "UNAVAILABLE" - ] + "non_idempotent": [] }, "retry_params": { "default": { diff --git a/packages/pubsub/src/v1/publisher_client_config.json b/packages/pubsub/src/v1/publisher_client_config.json index d576c1b62d9..905e790b218 100644 --- a/packages/pubsub/src/v1/publisher_client_config.json +++ b/packages/pubsub/src/v1/publisher_client_config.json @@ -7,7 +7,12 @@ "UNAVAILABLE" ], "one_plus_delivery": [ + "CANCELLED", + "UNKNOWN", "DEADLINE_EXCEEDED", + "RESOURCE_EXHAUSTED", + "ABORTED", + "INTERNAL", "UNAVAILABLE" ], "non_idempotent": [] diff --git a/packages/pubsub/src/v1/subscriber_client_config.json b/packages/pubsub/src/v1/subscriber_client_config.json index 7b2299e951b..2c8efffba81 100644 --- a/packages/pubsub/src/v1/subscriber_client_config.json +++ b/packages/pubsub/src/v1/subscriber_client_config.json @@ -6,7 +6,14 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [] + "non_idempotent": [], + "pull": [ + "CANCELLED", + "DEADLINE_EXCEEDED", + "RESOURCE_EXHAUSTED", + "INTERNAL", + "UNAVAILABLE" + ] }, "retry_params": { "default": { @@ -66,12 +73,12 @@ }, "Pull": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "pull", "retry_params_name": "messaging" }, "StreamingPull": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "pull", "retry_params_name": "messaging" }, "ModifyPushConfig": { diff --git a/packages/spanner/src/v1/spanner_client_config.json b/packages/spanner/src/v1/spanner_client_config.json index 76c56b6880c..58685424a46 100644 --- a/packages/spanner/src/v1/spanner_client_config.json +++ b/packages/spanner/src/v1/spanner_client_config.json @@ -6,9 +6,7 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [ - "UNAVAILABLE" - ] + "non_idempotent": [] }, "retry_params": { "default": { diff --git a/packages/speech/src/v1/speech_client_config.json b/packages/speech/src/v1/speech_client_config.json index d5b79b33657..bf5c507caf1 100644 --- a/packages/speech/src/v1/speech_client_config.json +++ b/packages/speech/src/v1/speech_client_config.json @@ -6,9 +6,7 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [ - "UNAVAILABLE" - ] + "non_idempotent": [] }, "retry_params": { "default": { @@ -23,7 +21,7 @@ }, "methods": { "Recognize": { - "timeout_millis": 60000, + "timeout_millis": 190000, "retry_codes_name": "idempotent", "retry_params_name": "default" }, diff --git a/packages/video-intelligence/src/v1beta1/video_intelligence_service_client_config.json b/packages/video-intelligence/src/v1beta1/video_intelligence_service_client_config.json index 7dd61bbb7b5..996b2ab5e30 100644 --- a/packages/video-intelligence/src/v1beta1/video_intelligence_service_client_config.json +++ b/packages/video-intelligence/src/v1beta1/video_intelligence_service_client_config.json @@ -6,9 +6,7 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [ - "UNAVAILABLE" - ] + "non_idempotent": [] }, "retry_params": { "default": { diff --git a/packages/vision/src/v1/image_annotator_client_config.json b/packages/vision/src/v1/image_annotator_client_config.json index b7b8b93a752..a5623731dc0 100644 --- a/packages/vision/src/v1/image_annotator_client_config.json +++ b/packages/vision/src/v1/image_annotator_client_config.json @@ -6,9 +6,7 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [ - "UNAVAILABLE" - ] + "non_idempotent": [] }, "retry_params": { "default": { From 917d0f3d6ff3ffa50aee1a24b05b9e133691c54c Mon Sep 17 00:00:00 2001 From: Song Wang Date: Wed, 14 Jun 2017 16:07:32 -0700 Subject: [PATCH 2/2] update gapic retry config - add spanner admin --- .../src/admin/database/v1/database_admin_client_config.json | 4 +--- .../src/admin/instance/v1/instance_admin_client_config.json | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/spanner/src/admin/database/v1/database_admin_client_config.json b/packages/spanner/src/admin/database/v1/database_admin_client_config.json index bba6763e010..d77f6bd5fb8 100644 --- a/packages/spanner/src/admin/database/v1/database_admin_client_config.json +++ b/packages/spanner/src/admin/database/v1/database_admin_client_config.json @@ -6,9 +6,7 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [ - "UNAVAILABLE" - ] + "non_idempotent": [] }, "retry_params": { "default": { diff --git a/packages/spanner/src/admin/instance/v1/instance_admin_client_config.json b/packages/spanner/src/admin/instance/v1/instance_admin_client_config.json index c438b46bd79..30e03a88ccd 100644 --- a/packages/spanner/src/admin/instance/v1/instance_admin_client_config.json +++ b/packages/spanner/src/admin/instance/v1/instance_admin_client_config.json @@ -6,9 +6,7 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [ - "UNAVAILABLE" - ] + "non_idempotent": [] }, "retry_params": { "default": {