-
-
Notifications
You must be signed in to change notification settings - Fork 826
platform: use FILE_FLAG_WRITE_THROUGH on Windows for SyncFile data durability, fixes #9388 #9389
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
Open
mr-raj12
wants to merge
1
commit into
borgbackup:master
Choose a base branch
from
mr-raj12:win32-syncfile-write-through
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,90 @@ | ||
| import os | ||
| import tempfile | ||
|
|
||
| import pytest | ||
|
|
||
| from .platform_test import skipif_not_win32 | ||
|
|
||
| # Set module-level skips | ||
| pytestmark = [skipif_not_win32] | ||
|
|
||
|
|
||
| def test_syncfile_basic(): | ||
| """Integration: SyncFile creates file and writes data correctly.""" | ||
| from ...platform.windows import SyncFile | ||
|
|
||
| with tempfile.TemporaryDirectory() as tmpdir: | ||
|
Member
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. iirc there is a pytest fixture for temp dirs. |
||
| path = os.path.join(tmpdir, "testfile") | ||
| with SyncFile(path, binary=True) as sf: | ||
| sf.write(b"hello borg") | ||
| with open(path, "rb") as f: | ||
| assert f.read() == b"hello borg" | ||
|
|
||
|
|
||
| def test_syncfile_file_exists_error(): | ||
| """SyncFile raises FileExistsError if file already exists.""" | ||
| from ...platform.windows import SyncFile | ||
|
|
||
| with tempfile.TemporaryDirectory() as tmpdir: | ||
| path = os.path.join(tmpdir, "testfile") | ||
| open(path, "w").close() | ||
|
Member
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. pathlib Paths have .touch method. |
||
| with pytest.raises(FileExistsError): | ||
| SyncFile(path, binary=True) | ||
|
|
||
|
|
||
| def test_syncfile_text_mode(): | ||
| """SyncFile works in text mode.""" | ||
| from ...platform.windows import SyncFile | ||
|
|
||
| with tempfile.TemporaryDirectory() as tmpdir: | ||
| path = os.path.join(tmpdir, "testfile.txt") | ||
| with SyncFile(path) as sf: | ||
| sf.write("hello text") | ||
| with open(path, "r") as f: | ||
| assert f.read() == "hello text" | ||
|
|
||
|
|
||
| def test_syncfile_fd_fallback(): | ||
| """SyncFile with fd falls back to base implementation (mirrors SaveFile usage).""" | ||
| from ...platform.windows import SyncFile | ||
|
|
||
| with tempfile.TemporaryDirectory() as tmpdir: | ||
| fd, path = tempfile.mkstemp(dir=tmpdir) | ||
| with SyncFile(path, fd=fd, binary=True) as sf: | ||
| sf.write(b"fallback test") | ||
| with open(path, "rb") as f: | ||
| assert f.read() == b"fallback test" | ||
|
|
||
|
|
||
| def test_syncfile_sync(): | ||
| """Explicit sync() does not raise.""" | ||
| from ...platform.windows import SyncFile | ||
|
|
||
| with tempfile.TemporaryDirectory() as tmpdir: | ||
| path = os.path.join(tmpdir, "testfile") | ||
| with SyncFile(path, binary=True) as sf: | ||
| sf.write(b"sync test data") | ||
| sf.sync() | ||
|
|
||
|
|
||
| def test_syncfile_uses_write_through(monkeypatch): | ||
| """Verify CreateFileW is called with FILE_FLAG_WRITE_THROUGH.""" | ||
| from ...platform import windows | ||
|
|
||
| calls = [] | ||
| original = windows._CreateFileW | ||
|
|
||
| def mock_create(*args): | ||
| calls.append(args) | ||
| return original(*args) | ||
|
|
||
| monkeypatch.setattr(windows, "_CreateFileW", mock_create) | ||
|
|
||
| with tempfile.TemporaryDirectory() as tmpdir: | ||
| path = os.path.join(tmpdir, "testfile") | ||
| with windows.SyncFile(path, binary=True) as sf: | ||
| sf.write(b"write-through test") | ||
|
|
||
| assert len(calls) == 1 | ||
| flags_attrs = calls[0][5] # 6th arg: dwFlagsAndAttributes | ||
| assert flags_attrs & windows.FILE_FLAG_WRITE_THROUGH | ||
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.
are the flag values from
osvalid for that msvcrt call?