Add config option to enable multibucket preview distribution

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

2 files changed, 12 insertions, 9 deletions

diff --git a/lib/private/Files/Mount/ObjectStorePreviewCacheMountProvider.php b/lib/private/Files/Mount/ObjectStorePreviewCacheMountProvider.php
index dba1dfc28e5..9bbb744bbcc 100644
--- a/lib/private/Files/Mount/ObjectStorePreviewCacheMountProvider.php
+++ b/lib/private/Files/Mount/ObjectStorePreviewCacheMountProvider.php
@@ -55,6 +55,9 @@ class ObjectStorePreviewCacheMountProvider implements IRootMountProvider {
 		if (!is_array($this->config->getSystemValue('objectstore_multibucket'))) {
 			return [];
 		}
+		if ($this->config->getSystemValue('objectstore.multibucket.preview-distribution', false) !== true) {
+			return [];
+		}
 
 		$instanceId = $this->config->getSystemValueString('instanceid', '');
 		$mountPoints = [];
diff --git a/lib/private/Preview/Storage/Root.php b/lib/private/Preview/Storage/Root.php
index 37ae1758121..a284b037b35 100644
--- a/lib/private/Preview/Storage/Root.php
+++ b/lib/private/Preview/Storage/Root.php
@@ -32,23 +32,23 @@ use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFolder;
 
 class Root extends AppData {
+	private $isMultibucketPreviewDistributionEnabled = false;
 	public function __construct(IRootFolder $rootFolder, SystemConfig $systemConfig) {
 		parent::__construct($rootFolder, $systemConfig, 'preview');
+
+		$this->isMultibucketPreviewDistributionEnabled = $systemConfig->getValue('objectstore.multibucket.preview-distribution', false) === true;
 	}
 
 
 	public function getFolder(string $name): ISimpleFolder {
 		$internalFolder = $this->getInternalFolder($name);
 
-		try {
-			return parent::getFolder('old-multibucket/' . $internalFolder);
-		} catch (NotFoundException $e) {
-			// not in multibucket fallback #1
-		}
-		try {
-			return parent::getFolder('old-multibucket/' . $name);
-		} catch (NotFoundException $e) {
-			// not in multibucket fallback #2
+		if ($this->isMultibucketPreviewDistributionEnabled) {
+			try {
+				return parent::getFolder('old-multibucket/' . $internalFolder);
+			} catch (NotFoundException $e) {
+				// not in multibucket fallback
+			}
 		}
 
 		try {