Skip to content
Open
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
1 change: 1 addition & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

### CLI
* Show a once-per-day notice after a command when a newer CLI release is available, with a link to the release and the upgrade command for the detected install method. Suppressed for non-interactive/CI runs, JSON output, the Databricks Runtime, and development builds, and can be disabled with `DATABRICKS_CLI_DISABLE_UPDATE_CHECK` ([#5470](https://github.com/databricks/cli/pull/5470)).
* Increase the SSH server startup timeout from 10 to 45 minutes when a GPU accelerator is requested via `databricks ssh connect --accelerator` ([#5569](https://github.com/databricks/cli/pull/5569)).

### Bundles
* Remove API enum values and types that are still in development from the `databricks-bundles` Python package; these were never accepted by the backend ([#5484](https://github.com/databricks/cli/pull/5484)).
Expand Down
8 changes: 7 additions & 1 deletion experimental/ssh/cmd/connect.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ Connect to a dedicated cluster:
if connectionName == "" && clusterID == "" && !proxyMode {
connectionName = client.GenerateDefaultConnectionName(wsClient.Config.Host, accelerator)
}
// Serverless GPU compute can take much longer to provision than CPU compute,
// so allow extra time for the SSH server job to start.
startupTimeout := taskStartupTimeout
if accelerator != "" {
startupTimeout = gpuTaskStartupTimeout
}
opts := client.ClientOptions{
Profile: wsClient.Config.Profile,
ClusterID: clusterID,
Expand All @@ -103,7 +109,7 @@ Connect to a dedicated cluster:
HandoverTimeout: handoverTimeout,
ReleasesDir: releasesDir,
ServerTimeout: max(serverTimeout, shutdownDelay),
TaskStartupTimeout: taskStartupTimeout,
TaskStartupTimeout: startupTimeout,
AutoStartCluster: autoStartCluster,
ClientPublicKeyName: clientPublicKeyName,
ClientPrivateKeyName: clientPrivateKeyName,
Expand Down
17 changes: 9 additions & 8 deletions experimental/ssh/cmd/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ const (
defaultHandoverTimeout = 30 * time.Minute
defaultEnvironmentVersion = 4

serverTimeout = 24 * time.Hour
taskStartupTimeout = 10 * time.Minute
serverPortRange = 100
serverConfigDir = ".ssh-tunnel"
serverPrivateKeyName = "server-private-key"
serverPublicKeyName = "server-public-key"
clientPrivateKeyName = "client-private-key"
clientPublicKeyName = "client-public-key"
serverTimeout = 24 * time.Hour
taskStartupTimeout = 10 * time.Minute
gpuTaskStartupTimeout = 45 * time.Minute
serverPortRange = 100
serverConfigDir = ".ssh-tunnel"
serverPrivateKeyName = "server-private-key"
serverPublicKeyName = "server-public-key"
clientPrivateKeyName = "client-private-key"
clientPublicKeyName = "client-public-key"
)
Loading