Skip to content

Add custom timeout for tmpdb's database drops #214

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
bplunkett-stripe merged 1 commit into from
Jul 15, 2025
Merged

Add custom timeout for tmpdb's database drops #214

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
13 changes: 13 additions & 0 deletions pkg/tempdb/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ type (
metadataTable string
logger log.Logger
rootDatabase string
dropTimeout time.Duration
}

OnInstanceFactoryOpt func(*onInstanceFactoryOptions)
Expand Down Expand Up @@ -102,6 +103,13 @@ func WithRootDatabase(db string) OnInstanceFactoryOpt {
}
}

// WithDropTimeout sets the timeout used when dropping database
func WithDropTimeout(d time.Duration) OnInstanceFactoryOpt {
return func(opts *onInstanceFactoryOptions) {
opts.dropTimeout = d
}
}

type (
CreateConnPoolForDbFn func(ctx context.Context, dbName string) (*sql.DB, error)

Expand Down Expand Up @@ -129,6 +137,7 @@ func NewOnInstanceFactory(ctx context.Context, createConnPoolForDb CreateConnPoo
dbPrefix: DefaultOnInstanceDbPrefix,
metadataSchema: DefaultOnInstanceMetadataSchema,
metadataTable: DefaultOnInstanceMetadataTable,
dropTimeout: DefaultStatementTimeout,
rootDatabase: "postgres",
logger: log.SimpleLogger(),
}
Expand Down Expand Up @@ -259,6 +268,10 @@ func (o *onInstanceFactory) dropTempDatabase(ctx context.Context, dbName string)
}
defer rootConn.Close()

if _, err := rootConn.ExecContext(ctx, fmt.Sprintf("SET SESSION statement_timeout = %d;", o.options.dropTimeout.Milliseconds())); err != nil {
return fmt.Errorf("setting statement timeout: %w", err)
}

_, err = rootConn.ExecContext(ctx, fmt.Sprintf("DROP DATABASE %s;", dbName))
if err != nil {
return fmt.Errorf("dropping temporary database: %w", err)
Expand Down
Loading