wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extract batchDelete(), better comments

Browse source
This commit is contained in:
Jörn Friedrich Dreyer 2014-10-06 11:08:21 +02:00 committed by Vincent Petry
parent 0d0c9d0bb3
commit f664a31dec
1 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
apps/files_external/lib/amazons3.php
View file

@ -72,6 +72,9 @@ class AmazonS3 extends \OC\Files\Storage\Common {
return $path; return $path;
} }
/**
* when running the tests wait to let the buckets catch up
*/
private function testTimeout() { private function testTimeout() {
if ($this->test) { if ($this->test) {
sleep($this->timeout); sleep($this->timeout);
@ -208,49 +211,46 @@ class AmazonS3 extends \OC\Files\Storage\Common {
return false; return false;
} }
try { return $this->batchDelete($path);
do { // batches of 1000
// Since there are no real directories on S3, we need
// to delete all objects prefixed with the path.
$objects = $this->connection->listObjects(array(
'Bucket' => $this->bucket,
'Prefix' => $path . '/'
));
$this->connection->deleteObjects(array(
'Bucket' => $this->bucket,
'Objects' => $objects['Contents']
));
$this->testTimeout();
} while ($objects['IsTruncated']);
} catch (S3Exception $e) {
\OCP\Util::logException('files_external', $e);
return false;
}
return true;
} }
protected function clearBucket() { protected function clearBucket() {
try { try {
$this->connection->clearBucket($this->bucket); $this->connection->clearBucket($this->bucket);
return true;
// clearBucket() is not working with Ceph, so if it fails we try the slower approach // clearBucket() is not working with Ceph, so if it fails we try the slower approach
} catch (\Exception $e) { } catch (\Exception $e) {
try { return $this->batchDelete();
do { // batches of 1000
$objects = $this->connection->listObjects(array(
'Bucket' => $this->bucket
));
$this->connection->deleteObjects(array(
'Bucket' => $this->bucket,
'Objects' => $objects['Contents'] // delete 1000 objects in one http call
));
$this->testTimeout();
} while ($objects['IsTruncated']);
} catch (S3Exception $e) {
\OCP\Util::logException('files_external', $e);
return false;
}
} }
return false;
}
private function batchDelete ($path = null) {
$params = array(
'Bucket' => $this->bucket
);
if ($path !== null) {
$params['Prefix'] = $path . '/';
}
try {
// Since there are no real directories on S3, we need
// to delete all objects prefixed with the path.
do {
// instead of the iterator, manually loop over the list ...
$objects = $this->connection->listObjects($params);
// ... so we can delete the files in batches
$this->connection->deleteObjects(array(
'Bucket' => $this->bucket,
'Objects' => $objects['Contents']
));
$this->testTimeout();
// we reached the end when the list is no longer truncated
} while ($objects['IsTruncated']);
} catch (S3Exception $e) {
\OCP\Util::logException('files_external', $e);
return false;
}
return true;
} }
public function opendir($path) { public function opendir($path) {