Skip to content

Logging: harden sink creation against transient errors. #6180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tseaver merged 2 commits into from
Oct 9, 2018
Merged

Logging: harden sink creation against transient errors. #6180

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72f8fb9
Harden sink creation against transient errors.
tseaver Oct 9, 2018
69b3426
Further harden metric creation.
tseaver Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions logging/tests/system/test_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,10 @@ def test_create_metric(self):
metric = Config.CLIENT.metric(
METRIC_NAME, DEFAULT_FILTER, DEFAULT_DESCRIPTION)
self.assertFalse(metric.exists())
metric.create()
retry = RetryErrors(Conflict)

retry(metric.create)()

self.to_delete.append(metric)
self.assertTrue(metric.exists())

Expand All @@ -341,11 +344,14 @@ def test_list_metrics(self):
self.assertFalse(metric.exists())
before_metrics = list(Config.CLIENT.list_metrics())
before_names = set(before.name for before in before_metrics)
self.failIf(metric.name in before_names)
metric.create()
self.assertFalse(metric.name in before_names)
retry = RetryErrors(Conflict)
retry(metric.create)()
self.to_delete.append(metric)
self.assertTrue(metric.exists())

after_metrics = list(Config.CLIENT.list_metrics())

after_names = set(after.name for after in after_metrics)
self.assertTrue(metric.name in after_names)

Expand All @@ -359,7 +365,9 @@ def test_reload_metric(self):
self.to_delete.append(metric)
metric.filter_ = 'logName:other'
metric.description = 'local changes'

metric.reload()

self.assertEqual(metric.filter_, DEFAULT_FILTER)
self.assertEqual(metric.description, DEFAULT_DESCRIPTION)

Expand All @@ -375,7 +383,9 @@ def test_update_metric(self):
self.to_delete.append(metric)
metric.filter_ = NEW_FILTER
metric.description = NEW_DESCRIPTION

metric.update()

after_metrics = list(Config.CLIENT.list_metrics())
after_info = {metric.name: metric for metric in after_metrics}
after = after_info[METRIC_NAME]
Expand Down Expand Up @@ -406,9 +416,12 @@ def test_create_sink_storage_bucket(self):
uri = self._init_storage_bucket()
SINK_NAME = 'test-create-sink-bucket%s' % (_RESOURCE_ID,)

retry = RetryErrors((Conflict, ServiceUnavailable), max_tries=10)
sink = Config.CLIENT.sink(SINK_NAME, DEFAULT_FILTER, uri)
self.assertFalse(sink.exists())
sink.create()

retry(sink.create)()

self.to_delete.append(sink)
self.assertTrue(sink.exists())

Expand All @@ -434,9 +447,12 @@ def test_create_sink_pubsub_topic(self):

TOPIC_URI = 'pubsub.googleapis.com/%s' % (topic_path,)

retry = RetryErrors((Conflict, ServiceUnavailable), max_tries=10)
sink = Config.CLIENT.sink(SINK_NAME, DEFAULT_FILTER, TOPIC_URI)
self.assertFalse(sink.exists())
sink.create()

retry(sink.create)()

self.to_delete.append(sink)
self.assertTrue(sink.exists())

Expand Down Expand Up @@ -465,45 +481,53 @@ def _init_bigquery_dataset(self):

def test_create_sink_bigquery_dataset(self):
SINK_NAME = 'test-create-sink-dataset%s' % (_RESOURCE_ID,)
retry = RetryErrors((Conflict, ServiceUnavailable), max_tries=10)
uri = self._init_bigquery_dataset()
sink = Config.CLIENT.sink(SINK_NAME, DEFAULT_FILTER, uri)
self.assertFalse(sink.exists())
sink.create()

retry(sink.create)()

self.to_delete.append(sink)
self.assertTrue(sink.exists())

def test_list_sinks(self):
SINK_NAME = 'test-list-sinks%s' % (_RESOURCE_ID,)
uri = self._init_storage_bucket()
retry = RetryErrors((Conflict, ServiceUnavailable), max_tries=10)
sink = Config.CLIENT.sink(SINK_NAME, DEFAULT_FILTER, uri)
self.assertFalse(sink.exists())
before_sinks = list(Config.CLIENT.list_sinks())
before_names = set(before.name for before in before_sinks)
self.failIf(sink.name in before_names)
sink.create()
self.assertFalse(sink.name in before_names)
retry(sink.create)()
self.to_delete.append(sink)
self.assertTrue(sink.exists())

after_sinks = list(Config.CLIENT.list_sinks())

after_names = set(after.name for after in after_sinks)
self.assertTrue(sink.name in after_names)

def test_reload_sink(self):
SINK_NAME = 'test-reload-sink%s' % (_RESOURCE_ID,)
retry = RetryErrors(Conflict)
retry = RetryErrors((Conflict, ServiceUnavailable), max_tries=10)
uri = self._init_bigquery_dataset()
sink = Config.CLIENT.sink(SINK_NAME, DEFAULT_FILTER, uri)
self.assertFalse(sink.exists())
retry(sink.create)()
self.to_delete.append(sink)
sink.filter_ = 'BOGUS FILTER'
sink.destination = 'BOGUS DESTINATION'

sink.reload()

self.assertEqual(sink.filter_, DEFAULT_FILTER)
self.assertEqual(sink.destination, uri)

def test_update_sink(self):
SINK_NAME = 'test-update-sink%s' % (_RESOURCE_ID,)
retry = RetryErrors(Conflict, max_tries=10)
retry = RetryErrors((Conflict, ServiceUnavailable), max_tries=10)
bucket_uri = self._init_storage_bucket()
dataset_uri = self._init_bigquery_dataset()
UPDATED_FILTER = 'logName:syslog'
Expand All @@ -513,7 +537,9 @@ def test_update_sink(self):
self.to_delete.append(sink)
sink.filter_ = UPDATED_FILTER
sink.destination = dataset_uri

sink.update()

self.assertEqual(sink.filter_, UPDATED_FILTER)
self.assertEqual(sink.destination, dataset_uri)

Expand Down