Skip to content

Commit f945dbb

Browse files
committed
awstagdeprovision: Ignore more errors
We're leaking clusters in CI because of errors like [1]: time="2018-11-27T18:48:25Z" level=fatal msg="Unrecoverable error/timed out: error converting route53 zones to internal AWS objects: Throttling: Rate exceeded\n\tstatus code: 400, request id: 0573f1b4-f275-11e8-b479-fd079d6c6b48" With this commit, we just assume that any error will go away eventually, and keep rolling forward with exponential backoff. When that assumption breaks down, we expect the caller (e.g. ci-operator or a human user) to kill teardown (and optionally fix whatever was blocking it). Docs for AWS rate limits are in [2]; the main takeaway is that these limits are set by AWS with no way for us to request changes, and that most are per-account (not per-VPC or other resource that scales with the number of simultaneous CI clusters). [1]: https://storage.googleapis.com/origin-ci-test/pr-logs/pull/openshift_installer/738/pull-ci-openshift-installer-master-e2e-aws/1639/artifacts/e2e-aws/installer/.openshift_install.log [2]: https://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html
1 parent 91c0cee commit f945dbb

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

contrib/pkg/awstagdeprovision/awstagdeprovision.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,8 @@ func deleteS3Buckets(session *session.Session, filter AWSFilter, clusterName str
11571157

11581158
awsObjects, err := bucketsToAWSObjects(results.Buckets, s3Client, logger)
11591159
if err != nil {
1160-
return false, fmt.Errorf("error converting buckets to internal objects: %v", err)
1160+
logger.Debugf("error converting s3 buckets to native AWS objects: %v", err)
1161+
return false, nil
11611162
}
11621163

11631164
filteredObjects := filterObjects(awsObjects, filter)
@@ -1381,7 +1382,7 @@ func deleteRoute53(session *session.Session, filters AWSFilter, clusterName stri
13811382
awsZones, err := r53ZonesToAWSObjects(allZones.HostedZones, r53Client)
13821383
if err != nil {
13831384
logger.Debugf("error converting r53Zones to native AWS objects: %v", err)
1384-
return false, fmt.Errorf("error converting route53 zones to internal AWS objects: %v", err)
1385+
return false, nil
13851386
}
13861387

13871388
filteredZones := filterObjects(awsZones, filters)

0 commit comments

Comments
 (0)