Skip to content

[v10] Fix background database local proxy termination by SIGINT signal #16932

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
smallinsky merged 3 commits into from
Oct 7, 2022
Merged

[v10] Fix background database local proxy termination by SIGINT signal #16932

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52535e4
Fix background database local proxy termination by SIGINT signal
smallinsky Sep 30, 2022
ea07ab9
Merge branch 'branch/v10' into bot/backport-16875-branch/v10
smallinsky Oct 7, 2022
88b8ee6
Merge branch 'branch/v10' into bot/backport-16875-branch/v10
smallinsky Oct 7, 2022
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
10 changes: 7 additions & 3 deletions tool/tsh/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ func serializeDatabaseConfig(configInfo *dbConfigInfo, format string) (string, e
// maybeStartLocalProxy starts local TLS ALPN proxy if needed depending on the
// connection scenario and returns a list of options to use in the connect
// command.
func maybeStartLocalProxy(cf *CLIConf, tc *client.TeleportClient, profile *client.ProfileStatus, db *tlsca.RouteToDatabase,
func maybeStartLocalProxy(ctx context.Context, cf *CLIConf, tc *client.TeleportClient, profile *client.ProfileStatus, db *tlsca.RouteToDatabase,
database types.Database, rootClusterName string,
) ([]dbcmd.ConnectCommandFunc, error) {
if !shouldUseLocalProxyForDatabase(tc, db) {
Expand Down Expand Up @@ -600,7 +600,7 @@ func maybeStartLocalProxy(cf *CLIConf, tc *client.TeleportClient, profile *clien

go func() {
defer listener.Close()
if err := lp.Start(cf.Context); err != nil {
if err := lp.Start(ctx); err != nil {
log.WithError(err).Errorf("Failed to start local proxy")
}
}()
Expand Down Expand Up @@ -732,7 +732,11 @@ func onDatabaseConnect(cf *CLIConf) error {
return trace.Wrap(err)
}

opts, err := maybeStartLocalProxy(cf, tc, profile, routeToDatabase, database, rootClusterName)
// To avoid termination of background DB teleport proxy when a SIGINT is received don't use the cf.Context.
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

opts, err := maybeStartLocalProxy(ctx, cf, tc, profile, routeToDatabase, database, rootClusterName)
if err != nil {
return trace.Wrap(err)
}
Expand Down