diff options
author | Morris Jobke <hey@morrisjobke.de> | 2019-03-08 13:36:11 +0100 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2019-03-08 13:38:39 +0100 |
commit | 060b637b70ed44ac09e400a435ca066c514ef09a (patch) | |
tree | 6240481ae2dd87c555c97d19b9c3340c5d56c5e3 | |
parent | 49c7799496344ad1b5efa5295dad60c8595f4bf2 (diff) | |
download | nextcloud-server-060b637b70ed44ac09e400a435ca066c514ef09a.tar.gz nextcloud-server-060b637b70ed44ac09e400a435ca066c514ef09a.zip |
Show a setup warning in case S3 object storage is used as primary storage
* checks for at least 50 GB of free space
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
-rw-r--r-- | core/js/setupchecks.js | 12 | ||||
-rw-r--r-- | core/js/tests/specs/setupchecksSpec.js | 91 | ||||
-rw-r--r-- | settings/Controller/CheckSetupController.php | 37 | ||||
-rw-r--r-- | tests/Settings/Controller/CheckSetupControllerTest.php | 56 |
4 files changed, 182 insertions, 14 deletions
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 3e82e077994..c3b036ddf69 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -450,6 +450,18 @@ type: OC.SetupChecks.MESSAGE_TYPE_WARNING }) } + if (!data.isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed) { + messages.push({ + msg: t( + 'core', + 'This instance uses an S3 based object store as primary storage. The uploaded files are stored temporarily on the server and thus it is recommended to have 50 GB of free space available in the temp directory of PHP. Check the logs for full details about the path and the available space. To improve this please change the temporary directory in the php.ini or make more space available in that path.', + { + docLink: oc_defaults.docPlaceholderUrl.replace('PLACEHOLDER', 'admin-mysql-utf8mb4'), + } + ), + type: OC.SetupChecks.MESSAGE_TYPE_WARNING + }) + } } else { messages.push({ diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index aa9006d0ab5..0603ac72281 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -248,7 +248,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -299,7 +300,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -351,7 +353,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -401,7 +404,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -449,7 +453,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -499,7 +504,8 @@ describe('OC.SetupChecks tests', function() { ], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -547,7 +553,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -595,7 +602,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -643,7 +651,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -712,7 +721,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -761,7 +771,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -810,7 +821,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -859,7 +871,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: false + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -907,7 +920,8 @@ describe('OC.SetupChecks tests', function() { appDirsWithDifferentOwner: [], recommendedPHPModules: [], pendingBigIntConversionColumns: [], - isMysqlUsedWithoutUTF8MB4: true + isMysqlUsedWithoutUTF8MB4: true, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true }) ); @@ -919,6 +933,55 @@ describe('OC.SetupChecks tests', function() { done(); }); }); + + it('should return an error if there is not enough free space in the temp directory', function(done) { + var async = OC.SetupChecks.checkSetup(); + + suite.server.requests[0].respond( + 200, + { + 'Content-Type': 'application/json', + }, + JSON.stringify({ + hasFileinfoInstalled: true, + isGetenvServerWorking: true, + isReadOnlyConfig: false, + hasWorkingFileLocking: true, + hasValidTransactionIsolationLevel: true, + suggestedOverwriteCliURL: '', + isRandomnessSecure: true, + securityDocs: 'https://docs.owncloud.org/myDocs.html', + serverHasInternetConnection: true, + isMemcacheConfigured: true, + forwardedForHeadersWorking: true, + isCorrectMemcachedPHPModuleInstalled: true, + hasPassedCodeIntegrityCheck: true, + isOpcacheProperlySetup: true, + hasOpcacheLoaded: true, + isSettimelimitAvailable: true, + hasFreeTypeSupport: true, + missingIndexes: [], + cronErrors: [], + cronInfo: { + diffInSeconds: 0 + }, + isMemoryLimitSufficient: true, + appDirsWithDifferentOwner: [], + recommendedPHPModules: [], + pendingBigIntConversionColumns: [], + isMysqlUsedWithoutUTF8MB4: false, + isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: false + }) + ); + + async.done(function( data, s, x ){ + expect(data).toEqual([{ + msg: 'This instance uses an S3 based object store as primary storage. The uploaded files are stored temporarily on the server and thus it is recommended to have 50 GB of free space available in the temp directory of PHP. Check the logs for full details about the path and the available space. To improve this please change the temporary directory in the php.ini or make more space available in that path.', + type: OC.SetupChecks.MESSAGE_TYPE_WARNING + }]); + done(); + }); + }); }); describe('checkGeneric', function() { diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index ba84762196c..b23c48f4466 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -628,6 +628,42 @@ Raw output return $pendingColumns; } + protected function isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed(): bool { + $objectStore = $this->config->getSystemValue('objectstore', null); + $objectStoreMultibucket = $this->config->getSystemValue('objectstore_multibucket', null); + + if (!isset($objectStoreMultibucket) && !isset($objectStore)) { + return true; + } + + if (isset($objectStoreMultibucket['class']) && $objectStoreMultibucket['class'] !== 'OC\\Files\\ObjectStore\\S3') { + return true; + } + + if (isset($objectStore['class']) && $objectStore['class'] !== 'OC\\Files\\ObjectStore\\S3') { + return true; + } + + $tempPath = sys_get_temp_dir(); + if (!is_dir($tempPath)) { + $this->logger->error('Error while checking the temporary PHP path - it was not properly set to a directory. value: ' . $tempPath); + return false; + } + $freeSpaceInTemp = disk_free_space($tempPath); + if ($freeSpaceInTemp === false) { + $this->logger->error('Error while checking the available disk space of temporary PHP path - no free disk space returned. temporary path: ' . $tempPath); + return false; + } + + $freeSpaceInTempInGB = $freeSpaceInTemp / 1024 / 1024 / 1024; + if ($freeSpaceInTempInGB > 50) { + return true; + } + + $this->logger->warning('Checking the available space in the temporary path resulted in ' . round($freeSpaceInTempInGB, 1) . ' GB instead of the recommended 50GB. Path: ' . $tempPath); + return false; + } + /** * @return DataResponse */ @@ -669,6 +705,7 @@ Raw output 'recommendedPHPModules' => $this->hasRecommendedPHPModules(), 'pendingBigIntConversionColumns' => $this->hasBigIntConversionPendingColumns(), 'isMysqlUsedWithoutUTF8MB4' => $this->isMysqlUsedWithoutUTF8MB4(), + 'isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed' => $this->isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed(), ] ); } diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php index dd13b29697d..521cadfcd3b 100644 --- a/tests/Settings/Controller/CheckSetupControllerTest.php +++ b/tests/Settings/Controller/CheckSetupControllerTest.php @@ -160,6 +160,7 @@ class CheckSetupControllerTest extends TestCase { 'hasRecommendedPHPModules', 'hasBigIntConversionPendingColumns', 'isMysqlUsedWithoutUTF8MB4', + 'isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed', ])->getMock(); } @@ -526,6 +527,11 @@ class CheckSetupControllerTest extends TestCase { ->method('isMysqlUsedWithoutUTF8MB4') ->willReturn(false); + $this->checkSetupController + ->expects($this->once()) + ->method('isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed') + ->willReturn(true); + $expected = new DataResponse( [ 'isGetenvServerWorking' => true, @@ -570,6 +576,7 @@ class CheckSetupControllerTest extends TestCase { 'recommendedPHPModules' => [], 'pendingBigIntConversionColumns' => [], 'isMysqlUsedWithoutUTF8MB4' => false, + 'isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed' => true, ] ); $this->assertEquals($expected, $this->checkSetupController->check()); @@ -1400,4 +1407,53 @@ Array $this->assertSame($expected, $this->invokePrivate($checkSetupController, 'isMysqlUsedWithoutUTF8MB4')); } + + public function dataForIsEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed() { + return [ + ['singlebucket', 'OC\\Files\\ObjectStore\\Swift', true], + ['multibucket', 'OC\\Files\\ObjectStore\\Swift', true], + ['singlebucket', 'OC\\Files\\ObjectStore\\Custom', true], + ['multibucket', 'OC\Files\\ObjectStore\\Custom', true], + ['singlebucket', 'OC\Files\ObjectStore\Swift', true], + ['multibucket', 'OC\Files\ObjectStore\Swift', true], + ['singlebucket', 'OC\Files\ObjectStore\Custom', true], + ['multibucket', 'OC\Files\ObjectStore\Custom', true], + ]; + } + + /** + * @dataProvider dataForIsEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed + */ + public function testIsEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed(string $mode, string $className, bool $expected) { + $this->config->method('getSystemValue') + ->will($this->returnCallback(function($key, $default) use ($mode, $className) { + if ($key === 'objectstore' && $mode === 'singlebucket') { + return ['class' => $className]; + } + if ($key === 'objectstore_multibucket' && $mode === 'multibucket') { + return ['class' => $className]; + } + return $default; + })); + + $checkSetupController = new CheckSetupController( + 'settings', + $this->request, + $this->config, + $this->clientService, + $this->urlGenerator, + $this->util, + $this->l10n, + $this->checker, + $this->logger, + $this->dispatcher, + $this->db, + $this->lockingProvider, + $this->dateTimeFormatter, + $this->memoryInfo, + $this->secureRandom + ); + + $this->assertSame($expected, $this->invokePrivate($checkSetupController, 'isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed')); + } } |