-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
move root mount setup to mountproviders #31266
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.
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
Merged
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
8b7c844
move root mount setup to mountproviders
icewind1991 215fa17
catch storage not available when deleting avatar
icewind1991 72f9fd9
run ci with primary s3 setup
icewind1991 b0ce876
return dummy availability if storage is not found in cache
icewind1991 0235764
skip localstorage dependend trashbin test when not using local user s…
icewind1991 ad10a33
make share cache test resilient against skeleton files not being there
icewind1991 d08d0eb
skip localstorage dependend user test when not using local user storage
icewind1991 ec15020
also handle expired pre-write shared lock on dav upload when not usin…
icewind1991 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
move root mount setup to mountproviders
Signed-off-by: Robin Appelman <[email protected]>
- Loading branch information
commit 8b7c8447a0e1eebc512cb58ea734542e03f29374
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
| /** | ||
| * @copyright Copyright (c) 2022 Robin Appelman <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OC\Files\Mount; | ||
|
|
||
| use OC; | ||
| use OC\Files\ObjectStore\ObjectStoreStorage; | ||
| use OC\Files\Storage\LocalRootStorage; | ||
| use OC_App; | ||
| use OCP\Files\Config\IRootMountProvider; | ||
| use OCP\Files\Storage\IStorageFactory; | ||
| use OCP\IConfig; | ||
| use Psr\Log\LoggerInterface; | ||
|
|
||
| class RootMountProvider implements IRootMountProvider { | ||
| private IConfig $config; | ||
| private LoggerInterface $logger; | ||
|
|
||
| public function __construct(IConfig $config, LoggerInterface $logger) { | ||
| $this->config = $config; | ||
| $this->logger = $logger; | ||
| } | ||
|
|
||
| public function getRootMounts(IStorageFactory $loader): array { | ||
| $objectStore = $this->config->getSystemValue('objectstore', null); | ||
| $objectStoreMultiBucket = $this->config->getSystemValue('objectstore_multibucket', null); | ||
|
|
||
| if ($objectStoreMultiBucket) { | ||
| return [$this->getMultiBucketStoreRootMount($loader, $objectStoreMultiBucket)]; | ||
| } elseif ($objectStore) { | ||
| return [$this->getObjectStoreRootMount($loader, $objectStore)]; | ||
| } else { | ||
| return [$this->getLocalRootMount($loader)]; | ||
| } | ||
| } | ||
|
|
||
| private function validateObjectStoreConfig(array &$config) { | ||
| if (empty($config['class'])) { | ||
| $this->logger->error('No class given for objectstore', ['app' => 'files']); | ||
| } | ||
| if (!isset($config['arguments'])) { | ||
| $config['arguments'] = []; | ||
| } | ||
|
|
||
| // instantiate object store implementation | ||
| $name = $config['class']; | ||
| if (strpos($name, 'OCA\\') === 0 && substr_count($name, '\\') >= 2) { | ||
| $segments = explode('\\', $name); | ||
| OC_App::loadApp(strtolower($segments[1])); | ||
| } | ||
| } | ||
|
|
||
| private function getLocalRootMount(IStorageFactory $loader): MountPoint { | ||
| $configDataDirectory = $this->config->getSystemValue("datadirectory", OC::$SERVERROOT . "/data"); | ||
| return new MountPoint(LocalRootStorage::class, '/', ['datadir' => $configDataDirectory], $loader, null, null, self::class); | ||
| } | ||
|
|
||
| private function getObjectStoreRootMount(IStorageFactory $loader, array $config): MountPoint { | ||
| $this->validateObjectStoreConfig($config); | ||
|
|
||
| $config['arguments']['objectstore'] = new $config['class']($config['arguments']); | ||
| // mount with plain / root object store implementation | ||
| $config['class'] = ObjectStoreStorage::class; | ||
|
|
||
| return new MountPoint($config['class'], '/', $config['arguments'], $loader, null, null, self::class); | ||
| } | ||
|
|
||
| private function getMultiBucketStoreRootMount(IStorageFactory $loader, array $config): MountPoint { | ||
| $this->validateObjectStoreConfig($config); | ||
|
|
||
| if (!isset($config['arguments']['bucket'])) { | ||
| $config['arguments']['bucket'] = ''; | ||
| } | ||
| // put the root FS always in first bucket for multibucket configuration | ||
| $config['arguments']['bucket'] .= '0'; | ||
|
|
||
| $config['arguments']['objectstore'] = new $config['class']($config['arguments']); | ||
| // mount with plain / root object store implementation | ||
| $config['class'] = ObjectStoreStorage::class; | ||
|
|
||
| return new MountPoint($config['class'], '/', $config['arguments'], $loader, null, null, self::class); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.