Skip to content

Revert "Delete S3 versions in rmdir" #29185

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
icewind1991 merged 1 commit into from
Oct 15, 2021
Merged

Revert "Delete S3 versions in rmdir" #29185

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Revert "Delete S3 versions in rmdir"
  • Loading branch information
@PVince81
PVince81 authored Oct 12, 2021
commit d02936bfb33b82e9b322406d9618b8e0c41ef1f0
24 changes: 1 addition & 23 deletions apps/files_external/lib/Lib/Storage/AmazonS3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,35 +311,13 @@ private function batchDelete($path = null) {
$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']);
Expand Down