-
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #31266 from nextcloud/root-setup-mountprovider
move root mount setup to mountproviders
- Loading branch information
Showing
13 changed files
with
361 additions
and
113 deletions.
There are no files selected for viewing
This file contains 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,70 @@ | ||
| name: S3 primary storage | ||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - master | ||
| - stable* | ||
|
|
||
|
|
||
| jobs: | ||
| s3-primary-tests-minio: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| # do not stop on another job's failure | ||
| fail-fast: false | ||
| matrix: | ||
| php-versions: ['8.0'] | ||
| key: ['objectstore', 'objectstore_multibucket'] | ||
|
|
||
| name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio | ||
|
|
||
| services: | ||
| minio: | ||
| env: | ||
| MINIO_ACCESS_KEY: minio | ||
| MINIO_SECRET_KEY: minio123 | ||
| image: bitnami/minio:2021.10.6 | ||
| ports: | ||
| - "9000:9000" | ||
|
|
||
| steps: | ||
| - name: Checkout server | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| submodules: true | ||
|
|
||
| - name: Set up php ${{ matrix.php-versions }} | ||
| uses: shivammathur/setup-php@v2 | ||
| with: | ||
| php-version: ${{ matrix.php-versions }} | ||
| tools: phpunit | ||
| extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd | ||
|
|
||
| - name: Set up Nextcloud | ||
| run: | | ||
| mkdir data | ||
| echo '<?php $CONFIG=["${{ matrix.key }}" => ["class" => "OC\Files\ObjectStore\S3", "arguments" => ["bucket" => "nextcloud", "autocreate" => true, "key" => "minio", "secret" => "minio123", "hostname" => "localhost", "port" => 9000, "use_ssl" => false, "use_path_style" => true, "uploadPartSize" => 52428800]]];' > config/config.php | ||
| ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password | ||
| php -f index.php | ||
| - name: PHPUnit | ||
| working-directory: tests | ||
| run: phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB | ||
| - name: S3 logs | ||
| if: always() | ||
| run: | | ||
| docker ps -a | ||
| docker logs $(docker ps -aq) | ||
| s3-primary-summary: | ||
| runs-on: ubuntu-latest | ||
| needs: [s3-primary-tests-minio] | ||
|
|
||
| if: always() | ||
|
|
||
| steps: | ||
| - name: Summary status | ||
| run: if ${{ needs.s3-primary-tests-minio.result != 'success' }}; then exit 1; fi |
This file contains 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 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 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 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 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 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 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 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 <robin@icewind.nl> | ||
| * | ||
| * @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 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.