fix(workspace): a copy cancelled just before its commit never commits
CI / Build and test (pull_request) Successful in 8m56s
CI / Windows tests and installer (pull_request) Skipped
CI / YAML check (pull_request) Successful in 8s
CI / PostgreSQL 16 integration (pull_request) Successful in 9m46s
CI / PostgreSQL 17 integration (pull_request) Successful in 9m56s
CI / Docker image (pull_request) Successful in 1m35s
CI / Build and test (pull_request) Successful in 8m56s
CI / Windows tests and installer (pull_request) Skipped
CI / YAML check (pull_request) Successful in 8s
CI / PostgreSQL 16 integration (pull_request) Successful in 9m46s
CI / PostgreSQL 17 integration (pull_request) Successful in 9m56s
CI / Docker image (pull_request) Successful in 1m35s
A cancel landing while the copy's last query was in flight (PostgreSQL answers a finished query anyway) went unseen: the copy took the freed project lease, committed media.json and ended Done over Cancelled, so its clean-up never ran. Both commit points now check the token under the lease. Seen once in CI's PostgreSQL 17 run of ACancelledFirstCopyRemovesTheMediaItWroteOnceItStopped. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
99ae344c0d
commit
bc90e5a244
2 files changed
+8
No files matched your search
@@ -51,6 +51,8 @@ commits follow Conventional Commits (release notes are generated from them by `C
|
|||||||
keeps *Change…* and *Move…* disabled until then. The Server header no longer shows this PC's local renders as server
|
keeps *Change…* and *Move…* disabled until then. The Server header no longer shows this PC's local renders as server
|
||||||
jobs; the *Copying originals* toast's Jobs button works; disabled *Copy originals…* and *Proxies only…* say why.
|
jobs; the *Copying originals* toast's Jobs button works; disabled *Copy originals…* and *Proxies only…* say why.
|
||||||
Italian wording.
|
Italian wording.
|
||||||
|
- A workspace copy cancelled just before it committed (its last query already answered, the project's lease then free)
|
||||||
|
could commit anyway and end *Done*, keeping the media it wrote; it now stops at the commit and its clean-up runs.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
- *Pause uploads on metered* (Server screen) is now *Pause metered transfers*: on a metered connection the sync's
|
- *Pause uploads on metered* (Server screen) is now *Pause metered transfers*: on a metered connection the sync's
|
||||||
|
|||||||
@@ -465,6 +465,9 @@ internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService
|
|||||||
// The working state is the editor's meanwhile: it is held only while the media index and the positions move.
|
// The working state is the editor's meanwhile: it is held only while the media index and the positions move.
|
||||||
using (await project.LockAsync(LockWait, ct).ConfigureAwait(false))
|
using (await project.LockAsync(LockWait, ct).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
|
// The commit point: a cancel that came while the copy waited (a query it did not stop, the lease) wins here,
|
||||||
|
// so a cancelled copy never commits and its clean-up removes what it wrote.
|
||||||
|
ct.ThrowIfCancellationRequested();
|
||||||
Commit(project, project.ReadBundle(), media, row.Folder, row.DisplayTitle);
|
Commit(project, project.ReadBundle(), media, row.Folder, row.DisplayTitle);
|
||||||
RemoveStale(project, media, frames);
|
RemoveStale(project, media, frames);
|
||||||
}
|
}
|
||||||
@@ -600,6 +603,9 @@ internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService
|
|||||||
// The working state is the editor's meanwhile: it is held only while the media index and the positions move.
|
// The working state is the editor's meanwhile: it is held only while the media index and the positions move.
|
||||||
using (await project.LockAsync(LockWait, ct).ConfigureAwait(false))
|
using (await project.LockAsync(LockWait, ct).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
|
// The commit point: a cancel that came while the copy waited (a query it did not stop, the lease) wins here,
|
||||||
|
// so a cancelled copy never commits and its clean-up removes what it wrote.
|
||||||
|
ct.ThrowIfCancellationRequested();
|
||||||
Commit(project, project.ReadBundle(), media, folder, sequence.DisplayTitle);
|
Commit(project, project.ReadBundle(), media, folder, sequence.DisplayTitle);
|
||||||
RemoveStale(project, media, frames);
|
RemoveStale(project, media, frames);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user