-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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.
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
fix: for Windows, copy snapshot files being backed up #22551
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
//go:build !windows | ||
// +build !windows | ||
|
||
package tsm1 | ||
|
||
import ( | ||
"fmt" | ||
"os" | ||
) | ||
|
||
// copyOrLink - allow substitution of a file copy for a hard link when running on Windows systems. | ||
func copyOrLink(oldPath, newPath string) error { | ||
if err := os.Link(oldPath, newPath); err != nil { | ||
return fmt.Errorf("error creating hard link for backup from %s to %s: %q", oldPath, newPath, err) | ||
} | ||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
//go:build windows | ||
// +build windows | ||
|
||
package tsm1 | ||
|
||
import ( | ||
"fmt" | ||
"io" | ||
"os" | ||
) | ||
|
||
// copyOrLink - Windows does not permit deleting a file with open file handles, so | ||
// instead of hard links, make temporary copies of files that can then be deleted. | ||
func copyOrLink(oldPath, newPath string) (returnErr error) { | ||
rfd, err := os.Open(oldPath) | ||
if err != nil { | ||
return fmt.Errorf("error opening file for backup %s: %q", oldPath, err) | ||
} else { | ||
defer func() { | ||
if e := rfd.Close(); returnErr == nil && e != nil { | ||
returnErr = fmt.Errorf("error closing source file for backup %s: %q", oldPath, e) | ||
} | ||
}() | ||
} | ||
fi, err := rfd.Stat() | ||
if err != nil { | ||
fmt.Errorf("error collecting statistics from file for backup %s: %q", oldPath, err) | ||
} | ||
wfd, err := os.OpenFile(newPath, os.O_RDWR|os.O_CREATE, fi.Mode()) | ||
if err != nil { | ||
return fmt.Errorf("error creating temporary file for backup %s: %q", newPath, err) | ||
} else { | ||
defer func() { | ||
if e := wfd.Close(); returnErr == nil && e != nil { | ||
returnErr = fmt.Errorf("error closing temporary file for backup %s: %q", newPath, e) | ||
} | ||
}() | ||
} | ||
if _, err := io.Copy(wfd, rfd); err != nil { | ||
return fmt.Errorf("unable to copy file for backup from %s to %s: %q", oldPath, newPath, err) | ||
} | ||
if err := os.Chtimes(newPath, fi.ModTime(), fi.ModTime()); err != nil { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Kind of ugly that Chtimes takes aTime here but only exposes reading ModTime in a cross-platform way - might be worth a comment |
||
return fmt.Errorf("unable to set modification time on temporary backup file %s: %q", newPath, err) | ||
} | ||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might be more straightforward to just check
runtime.GOOS == "windows"
, but this is fineThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was my original implementation, but reading various Go blogs convinced me conditional compilation was more idiomatic.