Hello community,
here is the log from the commit of package google-compute-engine for
openSUSE:Factory checked in at 2019-10-30 14:47:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-compute-engine (Old)
and /work/SRC/openSUSE:Factory/.google-compute-engine.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-compute-engine"
Wed Oct 30 14:47:12 2019 rev:18 rq:743901 version:20190801
Changes:
--------
---
/work/SRC/openSUSE:Factory/google-compute-engine/google-compute-engine.changes
2019-09-25 08:30:01.746371402 +0200
+++
/work/SRC/openSUSE:Factory/.google-compute-engine.new.2990/google-compute-engine.changes
2019-10-30 14:47:32.866165008 +0100
@@ -1,0 +2,6 @@
+Tue Oct 22 21:54:57 UTC 2019 - Robert Schweikert <rjsch...@suse.com>
+
+- Add gcei-waitlimit-dns.patch (bsc#1151398)
+ + Add a wait limit to retrying DNS resolution to avoid a forever loop
+
+-------------------------------------------------------------------
New:
----
gcei-waitlimit-dns.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-compute-engine.spec ++++++
--- /var/tmp/diff_new_pack.ZfvuVZ/_old 2019-10-30 14:47:33.854166058 +0100
+++ /var/tmp/diff_new_pack.ZfvuVZ/_new 2019-10-30 14:47:33.862166067 +0100
@@ -38,6 +38,8 @@
# see: https://github.com/GoogleCloudPlatform/compute-image-packages/issues/831
Patch5: gcei-normalize-python-version.patch
Patch6: gcei_disableipv6.patch
+# see: https://github.com/GoogleCloudPlatform/compute-image-packages/issues/862
+Patch7: gcei-waitlimit-dns.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -103,6 +105,7 @@
%endif
%patch5 -p1
%patch6 -p1
+%patch7
find -name "*.py" | xargs sed -i 'sm#!/usr/bin/pythonmm'
cp %{SOURCE9} google-optimize-local-ssd.service
cp %{SOURCE10} google-set-multiqueue.service
++++++ gcei-waitlimit-dns.patch ++++++
---
packages/python-google-compute-engine/google_compute_engine/metadata_watcher.py.orig
+++
packages/python-google-compute-engine/google_compute_engine/metadata_watcher.py
@@ -154,7 +154,7 @@ class MetadataWatcher(object):
def _HandleMetadataUpdate(
self, metadata_key='', recursive=True, wait=True, timeout=None,
- retry=True):
+ retry=True, retry_limit=50):
"""Wait for a successful metadata response.
Args:
@@ -163,12 +163,14 @@ class MetadataWatcher(object):
wait: bool, True if we should wait for a metadata change.
timeout: int, timeout in seconds for returning metadata output.
retry: bool, True if we should retry on failure.
+ retry_limit: int, number of times to retry obtaining metadata.
Returns:
json, the deserialized contents of the metadata server.
"""
exception = None
- while True:
+ retry_count = 0
+ while retry_count < retry_limit:
try:
return self._GetMetadataUpdate(
metadata_key=metadata_key, recursive=recursive, wait=wait,
@@ -178,6 +180,7 @@ class MetadataWatcher(object):
exception = e
self.logger.error('GET request error retrieving metadata. %s.', e)
if retry:
+ retry_count += 1
continue
else:
break
