Skip to content

[stable18] Delete chunks if the move on an upload failed #22240

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

Merged
MorrisJobke merged 4 commits into from
Aug 19, 2020
Merged

[stable18] Delete chunks if the move on an upload failed #22240

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c9fce6
Delete chunks if the move on an upload failed
juliusknorr Aug 6, 2020
d0d5275
Adjust chunking test for non-existing target node
juliusknorr Aug 12, 2020
818917c
Return proper status when file didn't exist before
juliusknorr Aug 13, 2020
dc8feeb
Fix broken backport
nickvergessen Aug 19, 2020
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
Next Next commit
Delete chunks if the move on an upload failed 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @backportbot
juliusknorr authored and backportbot[bot] committed Aug 13, 2020
commit 4c9fce62db3e40e323ab816532c18ecc4e55ce05
15 changes: 9 additions & 6 deletions apps/dav/lib/Upload/ChunkingPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,16 @@ function beforeMove($sourcePath, $destination) {
* @return bool|void false to stop handling, void to skip this handler
*/
public function performMove($path, $destination) {
if (!$this->server->tree->nodeExists($destination)) {
// skip and let the default handler do its work
return;
}

// do a move manually, skipping Sabre's default "delete" for existing nodes
$this->server->tree->move($path, $destination);
try {
$this->server->tree->move($path, $destination);
} catch (Forbidden $e) {
$sourceNode = $this->server->tree->getNodeForPath($path);
if ($sourceNode instanceof FutureFile) {
$sourceNode->delete();
}
throw $e;
}

// trigger all default events (copied from CorePlugin::move)
$this->server->emit('afterMove', [$path, $destination]);
Expand Down