Skip to content

Commit c568be5

Browse files
authored
[image-builder] Introduce retry for all resolver requests (timeout 15s, up to 3 times) for all network-related issues (#20868)
* [image-builder] Fix generate.sh * [image-builder-api] Add use_retry_client to ResolveBaseImageRequest and BuildRequest * [image-builder] Use req.GetUseRetryClient() instead of feature flag resolved on startup [image-builder] Drop superfluous imports [image-builder] Switch to github.com/hashicorp/go-retryablehttp, incl. better unit tests at orchestrator level! * [server] Pass "useRetryClient" on all requests to image-builder
1 parent 8cdc2a1 commit c568be5

19 files changed

+504
-86
lines changed

components/image-builder-api/generate.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ install_dependencies
1919
go_protoc "$COMPONENTS_DIR"
2020
typescript_protoc "$COMPONENTS_DIR"
2121

22-
go generate typescript/util/generate-ws-ready.go
23-
2422
# cd go
2523
pushd go
2624

components/image-builder-api/go/imgbuilder.pb.go

Lines changed: 79 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/go/imgbuilder_grpc.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/go/mock/mock.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/go/subassembly.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/go/subassembly_grpc.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/imgbuilder.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ message BuildSourceDockerfile {
4444
message ResolveBaseImageRequest {
4545
string ref = 1;
4646
BuildRegistryAuth auth = 2;
47+
bool use_retry_client = 3;
4748
}
4849

4950
message ResolveBaseImageResponse {
@@ -53,6 +54,7 @@ message ResolveBaseImageResponse {
5354
message ResolveWorkspaceImageRequest {
5455
BuildSource source = 1;
5556
BuildRegistryAuth auth = 2;
57+
bool use_retry_client = 3;
5658
}
5759

5860
message ResolveWorkspaceImageResponse {
@@ -68,6 +70,7 @@ message BuildRequest {
6870
string triggered_by = 4;
6971
string supervisor_ref = 5;
7072
string base_image_name_resolved = 6;
73+
bool use_retry_client = 7;
7174
}
7275

7376
message BuildRegistryAuth {

components/image-builder-api/typescript/src/imgbuilder_grpc_pb.d.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/typescript/src/imgbuilder_grpc_pb.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/typescript/src/imgbuilder_pb.d.ts

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)