fix(datastore): longer LRO timeout (GoogleCloudPlatform#5426)

Takashi Matsuo · web-flow · commit 96ccfbe1f8db · 2021-03-01T15:40:07.000-08:00
* fix(datastore): longer LRO timeout fixes GoogleCloudPlatform#5250 also remove unnecessarily long `max_time`. * also bump the max_time for snippet tests * remove commas from the license header * use namespace for Task tests * lint * use uuid for namespace
diff --git a/datastore/cloud-client/admin.py b/datastore/cloud-client/admin.py
@@ -1,4 +1,4 @@
-# Copyright 2016, Google, Inc.
+# Copyright 2016 Google, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -39,7 +39,7 @@ def export_entities(project_id, output_url_prefix):
     op = client.export_entities(
         {"project_id": project_id, "output_url_prefix": output_url_prefix}
     )
-    response = op.result(timeout=200)
+    response = op.result(timeout=300)
 
     print("Entities were exported\n")
     return response
@@ -58,7 +58,7 @@ def import_entities(project_id, input_url):
     op = client.import_entities(
         {"project_id": project_id, "input_url": input_url}
     )
-    response = op.result(timeout=200)
+    response = op.result(timeout=300)
 
     print("Entities were imported\n")
     return response
diff --git a/datastore/cloud-client/admin_test.py b/datastore/cloud-client/admin_test.py
@@ -1,4 +1,4 @@
-# Copyright 2016, Google, Inc.
+# Copyright 2016 Google, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -40,7 +40,7 @@ def test_get_index(self):
     def test_list_index(self):
         assert admin.list_indexes(PROJECT)
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_tries=3, max_time=540000)
+    @backoff.on_exception(backoff.expo, AssertionError, max_tries=3)
     def test_export_import_entities(self):
         response = admin.export_entities(PROJECT, "gs://" + BUCKET)
         assert response
diff --git a/datastore/cloud-client/snippets.py b/datastore/cloud-client/snippets.py
@@ -1,4 +1,4 @@
-# Copyright 2016, Google, Inc.
+# Copyright 2016 Google, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/datastore/cloud-client/snippets_test.py b/datastore/cloud-client/snippets_test.py
@@ -1,4 +1,4 @@
-# Copyright 2015, Google, Inc.
+# Copyright 2015 Google, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -106,19 +106,19 @@ def test_batch_lookup(self, client):
     def test_batch_delete(self, client):
         snippets.batch_delete(client)
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_unindexed_property_query(self, client):
         tasks = snippets.unindexed_property_query(client)
         client.entities_to_delete.extend(tasks)
         assert tasks
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_basic_query(self, client):
         tasks = snippets.basic_query(client)
         client.entities_to_delete.extend(tasks)
         assert tasks
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_projection_query(self, client):
         priorities, percents = snippets.projection_query(client)
         client.entities_to_delete.extend(client.query(kind="Task").fetch())
@@ -137,7 +137,7 @@ def test_cursor_paging(self, client):
         for n in range(6):
             client.entities_to_delete.append(snippets.insert(client))
 
-        @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+        @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
         def run_sample():
             results = snippets.cursor_paging(client)
             page_one, cursor_one, page_two, cursor_two = results
@@ -148,49 +148,49 @@ def run_sample():
 
         run_sample()
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_property_filter(self, client):
         tasks = snippets.property_filter(client)
         client.entities_to_delete.extend(tasks)
         assert tasks
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_composite_filter(self, client):
         tasks = snippets.composite_filter(client)
         client.entities_to_delete.extend(tasks)
         assert tasks
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_key_filter(self, client):
         tasks = snippets.key_filter(client)
         client.entities_to_delete.extend(tasks)
         assert tasks
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_ascending_sort(self, client):
         tasks = snippets.ascending_sort(client)
         client.entities_to_delete.extend(tasks)
         assert tasks
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_descending_sort(self, client):
         tasks = snippets.descending_sort(client)
         client.entities_to_delete.extend(tasks)
         assert tasks
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_multi_sort(self, client):
         tasks = snippets.multi_sort(client)
         client.entities_to_delete.extend(tasks)
         assert tasks
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_keys_only_query(self, client):
         keys = snippets.keys_only_query(client)
         client.entities_to_delete.extend(client.query(kind="Task").fetch())
         assert keys
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_distinct_on_query(self, client):
         tasks = snippets.distinct_on_query(client)
         client.entities_to_delete.extend(tasks)
@@ -246,33 +246,33 @@ def transactional_single_entity_group_read_only(self, client):
         assert task_list
         assert tasks_in_list
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_namespace_run_query(self, client):
         all_namespaces, filtered_namespaces = snippets.namespace_run_query(client)
         assert all_namespaces
         assert filtered_namespaces
         assert "google" in filtered_namespaces
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_kind_run_query(self, client):
         kinds = snippets.kind_run_query(client)
         client.entities_to_delete.extend(client.query(kind="Task").fetch())
         assert kinds
         assert "Task" in kinds
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_property_run_query(self, client):
         kinds = snippets.property_run_query(client)
         client.entities_to_delete.extend(client.query(kind="Task").fetch())
         assert kinds
         assert "Task" in kinds
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_property_by_kind_run_query(self, client):
         reprs = snippets.property_by_kind_run_query(client)
         client.entities_to_delete.extend(client.query(kind="Task").fetch())
         assert reprs
 
-    @backoff.on_exception(backoff.expo, AssertionError, max_time=120)
+    @backoff.on_exception(backoff.expo, AssertionError, max_time=240)
     def test_index_merge_queries(self, client):
         snippets.index_merge_queries(client)
diff --git a/datastore/cloud-client/tasks.py b/datastore/cloud-client/tasks.py
@@ -1,4 +1,4 @@
-# Copyright 2016, Google, Inc.
+# Copyright 2016 Google, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/datastore/cloud-client/tasks_test.py b/datastore/cloud-client/tasks_test.py
@@ -1,4 +1,4 @@
-# Copyright 2015, Google, Inc.
+# Copyright 2015 Google, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 import os
+import uuid
 
 import backoff
 from google.cloud import datastore
@@ -24,11 +25,17 @@
 
 @pytest.yield_fixture
 def client():
-    client = datastore.Client(PROJECT)
+    # We use namespace for isolating builds.
+    namespace = uuid.uuid4().hex
+    client = datastore.Client(PROJECT, namespace=namespace)
+
+    # Delete anything created during the tests in the past.
+    with client.batch():
+        client.delete_multi([x.key for x in client.query(kind="Task").fetch()])
 
     yield client
 
-    # Delete anything created during the test.
+    # Delete anything created during the tests.
     with client.batch():
         client.delete_multi([x.key for x in client.query(kind="Task").fetch()])
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2016, Google, Inc.`
	`1`	`+# Copyright 2016 Google, Inc.`
`2`	`2`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`3`	`3`	`# you may not use this file except in compliance with the License.`
`4`	`4`	`# You may obtain a copy of the License at`