diff --git a/src/views/backups.html b/src/views/backups.html index cf7699328..f6ab0214a 100644 --- a/src/views/backups.html +++ b/src/views/backups.html @@ -316,7 +316,7 @@
- +

{{ 'backups.configureBackupStorage.memoryLimitDescription' | tr }}

diff --git a/src/views/backups.js b/src/views/backups.js index 5d9502ad4..3ed432b36 100644 --- a/src/views/backups.js +++ b/src/views/backups.js @@ -6,6 +6,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat Client.onReady(function () { if (!Client.getUserInfo().isAtLeastAdmin) $location.path('/'); }); $scope.SECRET_PLACEHOLDER = SECRET_PLACEHOLDER; + $scope.MIN_MEMORY_LIMIT = 800 * 1024 * 1024; $scope.config = Client.getConfig(); $scope.user = Client.getUserInfo(); @@ -467,7 +468,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat advancedVisible: false, memoryTicks: [], - memoryLimit: 400 * 1024 * 1024, + memoryLimit: $scope.MIN_MEMORY_LIMIT, uploadPartSizeTicks: [], uploadPartSize: 50 * 1024 * 1024, copyConcurrency: '', @@ -498,7 +499,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat $scope.configureBackup.mountPoint = ''; $scope.configureBackup.acceptSelfSignedCerts = false; $scope.configureBackup.useHardlinks = true; - $scope.configureBackup.memoryLimit = 400 * 1024 * 1024; + $scope.configureBackup.memoryLimit = $scope.MIN_MEMORY_LIMIT; // scaleway only supports 1000 parts per object (https://www.scaleway.com/en/docs/s3-multipart-upload/) $scope.configureBackup.uploadPartSize = $scope.configureBackup.provider === 'scaleway-objectstorage' ? 100 * 1024 * 1024 : 10 * 1024 * 1024; @@ -546,8 +547,8 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat $scope.configureBackup.copyConcurrency = $scope.backupConfig.copyConcurrency || ($scope.backupConfig.provider === 's3' ? 500 : 10); var totalMemory = Math.max(($scope.memory.memory + $scope.memory.swap) * 1.5, 2 * 1024 * 1024); - $scope.configureBackup.memoryTicks = [ 400 * 1024 * 1024 ]; - for (var i = 512; i <= totalMemory/1024/1024; i *= 2) { + $scope.configureBackup.memoryTicks = [ $scope.MIN_MEMORY_LIMIT ]; + for (var i = 1024; i <= totalMemory/1024/1024; i *= 2) { $scope.configureBackup.memoryTicks.push(i * 1024 * 1024); }