zuul/nodepool
Code Issues Proposed changes

Merge "Remove duplicate log info from OpenStack driver"

Browse Source
This commit is contained in:
Zuul 2020-01-28 09:00:20 +00:00 committed by Gerrit Code Review
commit 79388c2be8
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nodepool/driver/openstack/handler.py
View File

@ -112,11 +112,9 @@ class OpenStackNodeLauncher(NodeLauncher):
label=self.label, provider=self.provider_config, node=self.node label=self.label, provider=self.provider_config, node=self.node
) )
self.log.info("Creating server with hostname %s in %s from image %s " self.log.info(
"for node id: %s" % (hostname, "Creating server with hostname %s in %s from image %s" % (
self.provider_config.name, hostname, self.provider_config.name, image_name))
image_name,
self.node.id))
# NOTE: We store the node ID in the server metadata to use for leaked # NOTE: We store the node ID in the server metadata to use for leaked
# instance detection. We cannot use the external server ID for this # instance detection. We cannot use the external server ID for this
@ -166,8 +164,7 @@ class OpenStackNodeLauncher(NodeLauncher):
# Checkpoint save the updated node info # Checkpoint save the updated node info
self.zk.storeNode(self.node) self.zk.storeNode(self.node)
self.log.debug("Waiting for server %s for node id: %s" % self.log.debug("Waiting for server %s" % server.id)
(server.id, self.node.id))
server = self.handler.manager.waitForServer( server = self.handler.manager.waitForServer(
server, self.provider_config.launch_timeout, server, self.provider_config.launch_timeout,
auto_ip=self.pool.auto_floating_ip) auto_ip=self.pool.auto_floating_ip)
@ -207,9 +204,9 @@ class OpenStackNodeLauncher(NodeLauncher):
self.zk.storeNode(self.node) self.zk.storeNode(self.node)
self.log.debug( self.log.debug(
"Node %s is running [region: %s, az: %s, ip: %s ipv4: %s, " "Node is running [region: %s, az: %s, ip: %s ipv4: %s, "
"ipv6: %s, hostid: %s]" % "ipv6: %s, hostid: %s]" %
(self.node.id, self.node.region, self.node.az, (self.node.region, self.node.az,
self.node.interface_ip, self.node.public_ipv4, self.node.interface_ip, self.node.public_ipv4,
self.node.public_ipv6, self.node.host_id)) self.node.public_ipv6, self.node.host_id))
@ -217,8 +214,7 @@ class OpenStackNodeLauncher(NodeLauncher):
host_keys = [] host_keys = []
if self.label.host_key_checking: if self.label.host_key_checking:
try: try:
self.log.debug( self.log.debug("Gathering host keys")
"Gathering host keys for node %s", self.node.id)
# only gather host keys if the connection type is ssh or # only gather host keys if the connection type is ssh or
# network_cli # network_cli
gather_host_keys = ( gather_host_keys = (
@ -252,10 +248,8 @@ class OpenStackNodeLauncher(NodeLauncher):
raise raise
except Exception as e: except Exception as e:
if attempts <= self._retries: if attempts <= self._retries:
self.log.exception( self.log.exception("Launch attempt %d/%d failed:",
"Request %s: Launch attempt %d/%d failed for node %s:", attempts, self._retries)
self.handler.request.id, attempts,
self._retries, self.node.id)
# If we got an external id we need to fetch the server info # If we got an external id we need to fetch the server info
# again in order to retrieve the fault reason as this is not # again in order to retrieve the fault reason as this is not
@ -267,16 +261,12 @@ class OpenStackNodeLauncher(NodeLauncher):
self.node.external_id) or {} self.node.external_id) or {}
fault = server.get('fault', {}).get('message') fault = server.get('fault', {}).get('message')
if fault: if fault:
self.log.error( self.log.error('Detailed node error: %s', fault)
'Request %s: Detailed error for node %s: %s',
self.handler.request.id, self.node.external_id,
fault)
if 'quota' in fault: if 'quota' in fault:
quota_exceeded = True quota_exceeded = True
except Exception: except Exception:
self.log.exception( self.log.exception(
'Request %s: Failed to retrieve error information ' 'Failed to retrieve node error information:')
'for node %s', self.node.external_id)
# If we created an instance, delete it. # If we created an instance, delete it.
if self.node.external_id: if self.node.external_id:
@ -287,9 +277,8 @@ class OpenStackNodeLauncher(NodeLauncher):
deleting_node.external_id = self.node.external_id deleting_node.external_id = self.node.external_id
deleting_node.state = zk.DELETING deleting_node.state = zk.DELETING
self.zk.storeNode(deleting_node) self.zk.storeNode(deleting_node)
self.log.info( self.log.info("Node %s scheduled for cleanup",
"Request %s: Node %s scheduled for cleanup", deleting_node.external_id)
self.handler.request.id, deleting_node.external_id)
self.node.external_id = None self.node.external_id = None
self.node.public_ipv4 = None self.node.public_ipv4 = None
self.node.public_ipv6 = None self.node.public_ipv6 = None
@ -310,7 +299,7 @@ class OpenStackNodeLauncher(NodeLauncher):
self.node.state = zk.READY self.node.state = zk.READY
self.zk.storeNode(self.node) self.zk.storeNode(self.node)
self.log.info("Node id %s is ready", self.node.id) self.log.info("Node is ready")
class OpenStackNodeRequestHandler(NodeRequestHandler): class OpenStackNodeRequestHandler(NodeRequestHandler):