Skip to content

allow disabling object store write check #33458

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
skjnldsv merged 2 commits into from
Oct 26, 2022
Merged

allow disabling object store write check #33458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5036a9
allow disabling object store write check
icewind1991 Aug 4, 2022
3357c8e
test disabling write check
icewind1991 Aug 4, 2022
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
8 changes: 7 additions & 1 deletion lib/private/Files/ObjectStore/ObjectStoreStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {

private $logger;

/** @var bool */
protected $validateWrites = true;

public function __construct($params) {
if (isset($params['objectstore']) && $params['objectstore'] instanceof IObjectStore) {
$this->objectStore = $params['objectstore'];
Expand All @@ -75,6 +78,9 @@ public function __construct($params) {
if (isset($params['objectPrefix'])) {
$this->objectPrefix = $params['objectPrefix'];
}
if (isset($params['validateWrites'])) {
$this->validateWrites = (bool)$params['validateWrites'];
}
//initialize cache with root directory in cache
if (!$this->is_dir('/')) {
$this->mkdir('/');
Expand Down Expand Up @@ -522,7 +528,7 @@ public function writeStream(string $path, $stream, int $size = null): int {
if ($exists) {
$this->getCache()->update($fileId, $stat);
} else {
if ($this->objectStore->objectExists($urn)) {
if (!$this->validateWrites || $this->objectStore->objectExists($urn)) {
$this->getCache()->move($uploadPath, $path);
} else {
$this->getCache()->remove($uploadPath);
Expand Down
4 changes: 4 additions & 0 deletions tests/lib/Files/ObjectStore/ObjectStoreStorageOverwrite.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,8 @@ public function setObjectStore(IObjectStore $objectStore) {
public function getObjectStore(): IObjectStore {
return $this->objectStore;
}

public function setValidateWrites(bool $validate) {
$this->validateWrites = $validate;
}
}
9 changes: 9 additions & 0 deletions tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,15 @@ public function testWriteObjectSilentFailure() {
$this->assertFalse($this->instance->file_exists('test.txt'));
}

public function testWriteObjectSilentFailureNoCheck() {
$objectStore = $this->instance->getObjectStore();
$this->instance->setObjectStore(new FailWriteObjectStore($objectStore));
$this->instance->setValidateWrites(false);

$this->instance->file_put_contents('test.txt', 'foo');
$this->assertTrue($this->instance->file_exists('test.txt'));
}

public function testDeleteObjectFailureKeepCache() {
$objectStore = $this->instance->getObjectStore();
$this->instance->setObjectStore(new FailDeleteObjectStore($objectStore));
Expand Down