Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/clickhouse/check_and_finalize.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions internal/clients/clickhouse/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

const (
defaultHTTPClientTimeout = 30 * time.Second
defaultOperationTimeout = 30 * time.Second
defaultOperationTimeout = 900 * time.Second
defaultOperationPollInterval = 2 * time.Second
)

Expand Down Expand Up @@ -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
Expand Down