zuul/nodepool
Code Issues Proposed changes

Merge "[provider][aws] fix exception when instance not found during cleanup"

Browse Source
This commit is contained in:
Zuul 2020-09-08 09:17:58 +00:00 committed by Gerrit Code Review
commit 65542a21c8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nodepool/driver/aws/provider.py
View File

@ -14,6 +14,8 @@
import logging import logging
import boto3 import boto3
import botocore.exceptions
import nodepool.exceptions
from nodepool.driver import Provider from nodepool.driver import Provider
from nodepool.driver.aws.handler import AwsNodeRequestHandler from nodepool.driver.aws.handler import AwsNodeRequestHandler
@ -154,7 +156,13 @@ class AwsProvider(Provider):
if self.ec2 is None: if self.ec2 is None:
return False return False
instance = self.ec2.Instance(server_id) instance = self.ec2.Instance(server_id)
instance.terminate() try:
instance.terminate()
except botocore.exceptions.ClientError as e:
error_code = e.response.get('Error', {}).get('Code', 'Unknown')
if error_code == "InvalidInstanceID.NotFound":
raise nodepool.exceptions.NotFound()
raise e
def waitForNodeCleanup(self, server_id): def waitForNodeCleanup(self, server_id):
# TODO: track instance deletion # TODO: track instance deletion