Skip to content

fix: remove 10m operation timeout regression (v0.2.0) #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
flashadmin merged 1 commit into from
Apr 21, 2026
Merged

fix: remove 10m operation timeout regression (v0.2.0) #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions pkg/cloudsql/cloudsql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func ExportCloudSQLDatabase(ctx context.Context, sqlAdminSvc *sqladmin.Service,
return err
}

err = WaitForSQLOperation(ctx, sqlAdminSvc, time.Minute*10, projectID, op)
err = WaitForSQLOperation(ctx, sqlAdminSvc, projectID, op)
if err != nil {
return err
}
Expand All @@ -161,19 +161,16 @@ func ExportCloudSQLDatabase(ctx context.Context, sqlAdminSvc *sqladmin.Service,
return nil
}

func WaitForSQLOperation(ctx context.Context, sqlAdminSvc *sqladmin.Service, timeout time.Duration, gcpProject string, op *sqladmin.Operation) error {
func WaitForSQLOperation(ctx context.Context, sqlAdminSvc *sqladmin.Service, gcpProject string, op *sqladmin.Operation) error {
if op == nil {
return errors.New("got nil op")
}

ctx, cancel := context.WithTimeout(ctx, timeout)
defer cancel()

opName := op.Name
for {
select {
case <-ctx.Done():
return fmt.Errorf("timeout waiting for operation %s: %w", opName, ctx.Err())
return fmt.Errorf("waiting for operation %s: %w", opName, ctx.Err())
default:
time.Sleep(time.Second * 10)
current, err := sqlAdminSvc.Operations.Get(gcpProject, opName).Do()
Expand Down