diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2024-05-22 16:22:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-22 16:22:28 +0200 |
| commit | 0e305bbc4727ddd99aef1392ccbf20ae18480776 (patch) | |
| tree | a8f56438be4e3560c7fe6846edb7c990a59a44f7 | |
| parent | 110c5ddc2a7d95713070a55f3e4c5e877908f0c1 (diff) | |
| parent | 514573d032033ec10377c03251ef707e5054db1e (diff) | |
Merge pull request #31277 from vespa-engine/jonmv/higher-submit-timeout
Incrase submit timeout to 40 minutes too
| -rw-r--r-- | client/go/internal/vespa/deploy.go | 4 | ||||
| -rw-r--r-- | hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/go/internal/vespa/deploy.go b/client/go/internal/vespa/deploy.go index 10ddb321e19..df74d1def8b 100644 --- a/client/go/internal/vespa/deploy.go +++ b/client/go/internal/vespa/deploy.go @@ -417,7 +417,7 @@ func Submit(opts DeploymentOptions, submission Submission) (int64, error) { Header: make(http.Header), } request.Header.Set("Content-Type", writer.FormDataContentType()) - response, err := deployServiceDo(request, time.Minute*10, opts) + response, err := deployServiceDo(request, time.Minute*40, opts) if err != nil { return 0, err } @@ -505,7 +505,7 @@ func uploadApplicationPackage(url *url.URL, opts DeploymentOptions) (PrepareResu if err != nil { return PrepareResult{}, err } - response, err := service.Do(request, time.Minute*10) + response, err := service.Do(request, time.Minute*40) if err != nil { return PrepareResult{}, err } diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java index 91717b46dcf..4d57c369d83 100644 --- a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java +++ b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java @@ -117,7 +117,7 @@ public abstract class ControllerHttpClient { /** Sends the given submission to the remote controller and returns the version of the accepted package, or throws if this fails. */ public SubmitResult submit(Submission submission, TenantName tenant, ApplicationName application) { return toSubmitResult(send(request(HttpRequest.newBuilder(applicationPath(tenant, application).resolve("submit")) - .timeout(Duration.ofMinutes(30)), + .timeout(Duration.ofMinutes(40)), POST, new MultiPartStreamer().addJson("submitOptions", metaToJson(submission)) .addFile("applicationZip", submission.applicationZip()) |