Skip to content

Extend timeout for database branch readiness checks #1127

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
mscoutermarsh merged 2 commits into from
Sep 18, 2025
Merged

Extend timeout for database branch readiness checks #1127

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
141dbc7
Extend timeout for database branch readiness checks
mscoutermarsh Sep 18, 2025
0d84de7
adjust branch ready checker to do less api requests
mscoutermarsh Sep 18, 2025
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
34 changes: 29 additions & 5 deletions internal/cmd/branch/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,17 @@ func CreateCmd(ch *cmdutil.Helper) *cobra.Command {
return cmd
}

// waitUntilReady waits until the given database branch is ready. It times out after 3 minutes.
// waitUntilReady waits until the given database branch is ready. It times out after 10 minutes.
func waitUntilReady(ctx context.Context, client *ps.Client, printer *printer.Printer, debug bool, getReq *ps.GetDatabaseBranchRequest) error {
ctx, cancel := context.WithTimeout(ctx, 3*time.Minute)
ctx, cancel := context.WithTimeout(ctx, 10*time.Minute)
defer cancel()

ticker := time.NewTicker(time.Second)
startTime := time.Now()
var ticker *time.Ticker

// Start with 5-second interval for the first minute
ticker = time.NewTicker(5 * time.Second)
defer ticker.Stop()

for {
select {
Expand All @@ -249,15 +254,27 @@ func waitUntilReady(ctx context.Context, client *ps.Client, printer *printer.Pri
if resp.Ready {
return nil
}

elapsed := time.Since(startTime)
if elapsed > time.Minute {
// Switch to 10-second interval after 1 minute
ticker.Stop()
ticker = time.NewTicker(10 * time.Second)
}
}
}
}

func waitUntilPostgresReady(ctx context.Context, client *ps.Client, printer *printer.Printer, debug bool, getReq *ps.GetPostgresBranchRequest) error {
ctx, cancel := context.WithTimeout(ctx, 3*time.Minute)
ctx, cancel := context.WithTimeout(ctx, 10*time.Minute)
defer cancel()

ticker := time.NewTicker(time.Second)
startTime := time.Now()
var ticker *time.Ticker

// Start with 5-second interval for the first minute
ticker = time.NewTicker(5 * time.Second)
defer ticker.Stop()

for {
select {
Expand All @@ -275,6 +292,13 @@ func waitUntilPostgresReady(ctx context.Context, client *ps.Client, printer *pri
if resp.Ready {
return nil
}

elapsed := time.Since(startTime)
if elapsed > time.Minute {
// Switch to 10-second interval after 1 minute
ticker.Stop()
ticker = time.NewTicker(10 * time.Second)
}
}
}
}