openstack/kuryr-kubernetes
Code Issues Proposed changes

Merge "cni: print different error logs for timeout errors"

Browse Source
This commit is contained in:
Zuul 2019-08-14 18:12:29 +00:00 committed by Gerrit Code Review
commit 5c2f3026ec
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kuryr_kubernetes/cni/daemon/service.py
View File

@ -80,10 +80,9 @@ class DaemonServer(object):
try:
vif = self.plugin.add(params)
data = jsonutils.dumps(vif.obj_to_primitive())
except exceptions.ResourceNotReady as e:
except exceptions.ResourceNotReady:
self._check_failure()
LOG.error("Timed out waiting for requested pod to appear in "
"registry: %s.", e)
LOG.error('Error when processing addNetwork request')
return '', httplib.GATEWAY_TIMEOUT, self.headers
except Exception:
self._check_failure()
@ -102,14 +101,14 @@ class DaemonServer(object):
try:
self.plugin.delete(params)
except exceptions.ResourceNotReady as e:
except exceptions.ResourceNotReady:
# NOTE(dulek): It's better to ignore this error - most of the time
# it will happen when pod is long gone and kubelet
# overzealously tries to delete it from the network.
# We cannot really do anything without VIF annotation,
# so let's just tell kubelet to move along.
LOG.warning("Timed out waiting for requested pod to appear in "
"registry: %s. Ignoring.", e)
LOG.warning('Error when processing delNetwork request. '
'Ignoring this error, pod is most likely gone')
return '', httplib.NO_CONTENT, self.headers
except Exception:
LOG.exception('Error when processing delNetwork request. CNI '

3
kuryr_kubernetes/cni/plugins/k8s_cni_registry.py
View File

@ -80,6 +80,7 @@ class K8sCNIRegistryPlugin(base_cni.CNIPlugin):
vifs = wait_for_active(pod_name)
for vif in vifs.values():
if not vif.active:
LOG.error("Timed out waiting for vifs to become active")
raise exceptions.ResourceNotReady(pod_name)
return vifs[k_const.DEFAULT_IFNAME]
@ -125,6 +126,8 @@ class K8sCNIRegistryPlugin(base_cni.CNIPlugin):
ifname, vif_obj in d['vifs'].items()
}
except KeyError:
LOG.error("Timed out waiting for requested pod to appear in "
"registry")
raise exceptions.ResourceNotReady(pod_name)
for ifname, vif in vifs.items():