File size: 3,535 Bytes
f50dbbb | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | # Issue
**Title:** [v2] Fix flaky download test
## Description
Fixes a Windows race condition introduced in that caused a flaky test:
```
================================== FAILURES ===================================
_ TestRangedDownload.test_ranged_download_full_object_checksum_mismatch_raises _
[gw2] win32 -- Python 3.13.13 C:\hostedtoolcache\windows\Python\3.13.13\x64\python.exe
self = <tests.functional.s3transfer.test_download.TestRangedDownload testMethod=test_ranged_download_full_object_checksum_mismatch_raises>
def tearDown(self):
super().tearDown()
> shutil.rmtree(self.tempdir)
functional\s3transfer\test_download.py:69:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
C:\hostedtoolcache\windows\Python\3.13.13\x64\Lib\shutil.py:790: in rmtree
return _rmtree_unsafe(path, onexc)
C:\hostedtoolcache\windows\Python\3.13.13\x64\Lib\shutil.py:629: in _rmtree_unsafe
onexc(os.unlink, fullname, err)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
path = 'C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\tmpl2hbz3lw'
onexc = <function rmtree.<locals>.onexc at 0x000001AFB553B1A0>
def _rmtree_unsafe(path, onexc):
def onerror(err):
if not isinstance(err, FileNotFoundError):
onexc(os.scandir, err.filename, err)
results = os.walk(path, topdown=False, onerror=onerror, followlinks=os._walk_symlinks_as_files)
for dirpath, dirnames, filenames in results:
for name in dirnames:
fullname = os.path.join(dirpath, name)
try:
os.rmdir(fullname)
except FileNotFoundError:
continue
except OSError as err:
onexc(os.rmdir, fullname, err)
for name in filenames:
fullname = os.path.join(dirpath, name)
try:
> os.unlink(fullname)
E PermissionError: [WinError 32] The process cannot access the file because it is being used by another process: 'C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\tmpl2hbz3lw\\myfile.169bbCC9'
C:\hostedtoolcache\windows\Python\3.13.13\x64\Lib\shutil.py:625: PermissionError
```
Before full object checksum validation, when a download failed, `announce_done` would be called once the single-threaded `IOWriteTasks` queue was drained. Since the transfer failed, `announce_done` fires failure cleanup tasks, which include deleting the file. Because there are no queued write tasks at this point, it's always safe to delete the file.
The commit introduced a change where `announce_done` is directly invoked from the submission thread when a pre-finalize callback fails. This direct `announce_done` call fires cleanup tasks. But because it's in a separate thread, it races against any pending write tasks. This isn't an issue in Linux/macOS, but Windows will throw an error when attempting to delete a file that's opened by another thread.
This PR fixes the issue by removing the direct `announce_done` call. Instead, it indirectly calls it by always running the final callback (same as previous behavior).
## Task
Modify the repository so that the issue described above is resolved. The repository is checked out at base commit `eab69168ba25`. Edit files in place; the verifier captures your changes via `git diff` and scores them against an oracle patch using SWE-RL-style diff-similarity reward. |