openstack/neutron
Code Issues Proposed changes

Merge "Ignore 404 error and lower a warning log to info" into stable/juno

Browse Source
This commit is contained in:
Jenkins 2015-04-03 06:59:24 +00:00 committed by Gerrit Code Review
commit 818ebcfc07
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
neutron/plugins/bigswitch/servermanager.py
View File

@ -510,11 +510,11 @@ class ServerPool(object):
LOG.error(errstr, resp[2])
raise RemoteRestError(reason=resp[2], status=resp[0])
if resp[0] in ignore_codes:
LOG.warning(_("NeutronRestProxyV2: Received and ignored error "
"code %(code)s on %(action)s action to resource "
"%(resource)s"),
{'code': resp[2], 'action': action,
'resource': resource})
LOG.info(_("NeutronRestProxyV2: Received and ignored error "
"code %(code)s on %(action)s action to resource "
"%(resource)s"),
{'code': resp[2], 'action': action,
'resource': resource})
return resp
def rest_create_router(self, tenant_id, router):
@ -604,7 +604,10 @@ class ServerPool(object):
def rest_get_switch(self, switch_id):
resource = SWITCHES_PATH % switch_id
errstr = _("Unable to retrieve switch: %s")
return self.rest_action('GET', resource, errstr=errstr)
resp = self.rest_action('GET', resource, errstr=errstr,
ignore_codes=[404])
# return None if switch not found, else return switch info
return None if resp[0] == 404 else resp[3]
def _consistency_watchdog(self, polling_interval=60):
if 'consistency' not in self.get_capabilities():

14
neutron/plugins/ml2/drivers/mech_bigswitch/driver.py
View File

@ -184,15 +184,11 @@ class BigSwitchMechanismDriver(plugin.NeutronRestProxyV2Base,
pass
try:
self.servers.rest_get_switch(host)
exists = True
except servermanager.RemoteRestError as e:
if e.status == 404:
exists = False
else:
# Another error, return without caching to try again on
# next binding
return
exists = bool(self.servers.rest_get_switch(host))
except servermanager.RemoteRestError:
# Connectivity or internal server error. Skip cache to try again on
# next binding attempt
return
self.ivs_host_cache[host] = {
'timestamp': datetime.datetime.now(),
'exists': exists