From 1b0487a214ef456d85a85972e9fd5c8b0c34eb2c Mon Sep 17 00:00:00 2001 From: Vladimir Iliakov Date: Thu, 18 Dec 2025 13:03:43 +0100 Subject: [PATCH] STAC-24021: Increase Clickhouse Backup API timeouts --- cmd/clickhouse/check_and_finalize.go | 2 +- internal/clients/clickhouse/client.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/clickhouse/check_and_finalize.go b/cmd/clickhouse/check_and_finalize.go index 74b258b..da054e3 100644 --- a/cmd/clickhouse/check_and_finalize.go +++ b/cmd/clickhouse/check_and_finalize.go @@ -82,7 +82,7 @@ func checkAndFinalize(appCtx *app.Context, operationID string, waitForComplete b } // Restore still running - appCtx.Logger.Infof("Restore is still in progress (status: %s)", status) + appCtx.Logger.Infof("Restore is still in progress (status: %s)", status.Status) // Status is "in progress" or other if waitForComplete { diff --git a/internal/clients/clickhouse/client.go b/internal/clients/clickhouse/client.go index a91adcc..1450098 100644 --- a/internal/clients/clickhouse/client.go +++ b/internal/clients/clickhouse/client.go @@ -15,7 +15,7 @@ import ( const ( defaultHTTPClientTimeout = 30 * time.Second - defaultOperationTimeout = 30 * time.Second + defaultOperationTimeout = 900 * time.Second defaultOperationPollInterval = 2 * time.Second ) @@ -182,7 +182,7 @@ func (c *Client) waitForAction(ctx context.Context, operationID string, timeout, case <-ticker.C: action, err := c.GetRestoreStatus(ctx, operationID) if err != nil { - return nil, fmt.Errorf("fail to get action with operation id: %s", operationID) + return nil, fmt.Errorf("fail to get action with operation id=%s : %w", operationID, err) } if action.Status == "success" || action.Status == "error" { return action, nil