zuul/nodepool
Code Issues Proposed changes

Merge "Include Fleet ID in error exception logs"

Browse Source
This commit is contained in:
Zuul
2025-06-23 09:26:39 +00:00
committed by Gerrit Code Review
parent 095400cf09 6abb182231
commit af6d60dba5
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nodepool/driver/aws/adapter.py
View File

@@ -1863,20 +1863,22 @@ class AwsAdapter(statemachine.Adapter):
with self.rate_limiter(log.debug, "Created fleet"):
resp = self.ec2_client.create_fleet(**args)
fleet_id = resp.get("FleetId")
if resp['Instances']:
instance_id = resp['Instances'][0]['InstanceIds'][0]
else:
if resp['Errors']:
error = resp['Errors'][0]
raise Exception("Couldn't create fleet instance because "
"of %s: %s", error["ErrorCode"],
error["ErrorMessage"])
raise Exception("Couldn't create fleet instance because "
"empty instance list was returned")
raise Exception("Couldn't create fleet %s instance "
"because of %s: %s", fleet_id,
error["ErrorCode"], error["ErrorMessage"])
raise Exception("Couldn't create fleet %s instance because "
"empty instance list was returned",
fleet_id)
log.debug("Created VM %s as instance %s using EC2 Fleet API",
hostname, instance_id)
log.debug("Created VM %s as instance %s using EC2 Fleet API: %s",
hostname, instance_id, fleet_id)
# Only return instance id in creating state, the state machine will
# refresh until the instance object is returned otherwise it can