Skip to content

Explain why upload type recovery must be retained #7245

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

Draft
shreyas-goenka wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Explain why upload type recovery must be retained #7245

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f18bd4
Explain why upload type recovery must be retained
shreyas-goenka Oct 29, 2026
b5781d1
Document upload classification regression and recovery lifetime
shreyas-goenka Oct 29, 2026
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
17 changes: 16 additions & 1 deletion libs/filer/workspace_files_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,22 @@ func messageNames(re *regexp.Regexp, msg, name string) bool {

// deleteNodeOfOtherType deletes the node that blocks an overwrite of absPath
// because its type differs from the upload's, and reports whether it did.
// CLI v1.21 and v1.22 uploaded some notebooks as files this way.
//
// Regression: CLI v1.21 switched from /workspace-files/import-file to
// /workspace/import (https://github.com/databricks/cli/pull/6149). The follow-up
// https://github.com/databricks/cli/pull/7034 added client-side notebook detection.
// These upload paths use different rules to recognize notebooks. For example,
// import-file accepts a notebook marker anywhere on the first line, but the CLI
// required an exact header match. A SQL notebook with a UTF-8 BOM was therefore
// uploaded as a file in v1.21/v1.22.
//
// Recovery: https://github.com/databricks/cli/pull/7218 restored import-file, so
// the same bytes can now be recognized as a notebook. Overwrite cannot change
// an existing node's type; delete and retry to keep those deployments working
// after an upgrade.
//
// Removal: this compatibility code can be removed once the risk of users
// upgrading directly from v1.21/v1.22 to the latest CLI is negligible.
func (w *WorkspaceFilesClient) deleteNodeOfOtherType(ctx context.Context, absPath string, uploadErr error) (bool, error) {
aerr, ok := errors.AsType[*apierr.APIError](uploadErr)
if !ok {
Expand Down
Loading