diff --git a/dashboard/src/views/backups.html b/dashboard/src/views/backups.html index 0988d9c51..b9aa0fe29 100644 --- a/dashboard/src/views/backups.html +++ b/dashboard/src/views/backups.html @@ -391,10 +391,10 @@
- +

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

- +
diff --git a/dashboard/src/views/backups.js b/dashboard/src/views/backups.js index ef6093e2e..c6017c6e1 100644 --- a/dashboard/src/views/backups.js +++ b/dashboard/src/views/backups.js @@ -7,7 +7,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.MIN_MEMORY_LIMIT = 1000 * 1024 * 1024; $scope.config = Client.getConfig(); $scope.user = Client.getUserInfo(); @@ -541,7 +541,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat $scope.configureBackup.chown = $scope.backupConfig.chown; var limits = $scope.backupConfig.limits || {}; - $scope.configureBackup.memoryLimit = limits.memoryLimit; + $scope.configureBackup.memoryLimit = Math.max(limits.memoryLimit, $scope.MIN_MEMORY_LIMIT); $scope.configureBackup.uploadPartSize = limits.uploadPartSize || ($scope.configureBackup.provider === 'scaleway-objectstorage' ? 100 * 1024 * 1024 : 10 * 1024 * 1024); $scope.configureBackup.downloadConcurrency = limits.downloadConcurrency || ($scope.backupConfig.provider === 's3' ? 30 : 10);