upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-27 12:54:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Merge pull request #29185 from nextcloud/revert-29165-bug/noid/s3-delete-folder-versions

Browse source 
Revert "Delete S3 versions in rmdir"
This commit is contained in:
Robin Appelman 2021-10-15 13:30:51 +00:00 committed by GitHub
commit fadeae8c8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/files_external/lib/Lib/Storage/AmazonS3.php
View file

@ -311,35 +311,13 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$connection->deleteObjects([
'Bucket' => $this->bucket,
'Delete' => [
'Objects' => $objects['Contents'],
'Objects' => $objects['Contents']
]
]);
$this->testTimeout();
}
// we reached the end when the list is no longer truncated
} while ($objects['IsTruncated']);
do {
// delete all contained versions and deletion markers
$objects = $connection->listObjectVersions($params);
if (isset($objects['Versions'])) {
$connection->deleteObjects([
'Bucket' => $this->bucket,
'Delete' => [
'Objects' => $objects['Versions'],
]
]);
}
if (isset($objects['DeleteMarkers'])) {
$connection->deleteObjects([
'Bucket' => $this->bucket,
'Delete' => [
'Objects' => $objects['DeleteMarkers'],
]
]);
}
// we reached the end when the list is no longer truncated
} while ($objects['IsTruncated']);
$this->deleteObject($path);
} catch (S3Exception $e) {
\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);