diff --git a/dashboard/src/views/backups.html b/dashboard/src/views/backups.html index 55b9ba3c8..23b4d480b 100644 --- a/dashboard/src/views/backups.html +++ b/dashboard/src/views/backups.html @@ -393,15 +393,21 @@

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

- +
- +

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

-
- -
+ + + + + + + + +
diff --git a/dashboard/src/views/backups.js b/dashboard/src/views/backups.js index 488ee028d..22b8805db 100644 --- a/dashboard/src/views/backups.js +++ b/dashboard/src/views/backups.js @@ -464,7 +464,6 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat memoryTicks: [], memoryLimit: $scope.MIN_MEMORY_LIMIT, - uploadPartSizeTicks: [], uploadPartSize: 50 * 1024 * 1024, copyConcurrency: '', downloadConcurrency: '', @@ -549,11 +548,6 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat $scope.configureBackup.syncConcurrency = limits.syncConcurrency || ($scope.backupConfig.provider === 's3' ? 20 : 10); $scope.configureBackup.copyConcurrency = limits.copyConcurrency || ($scope.backupConfig.provider === 's3' ? 500 : 10); - $scope.configureBackup.uploadPartSizeTicks = [ 5 * 1024 * 1024 ]; - for (var j = 32; j <= 1 * 1024; j *= 2) { // 5 GB is max for s3. but let's keep things practical for now. we upload 3 parts in parallel - $scope.configureBackup.uploadPartSizeTicks.push(j * 1024 * 1024); - } - var mountOptions = $scope.backupConfig.mountOptions || {}; $scope.configureBackup.mountOptions = { host: mountOptions.host || '', @@ -708,7 +702,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat backupConfig.noHardlinks = !$scope.configureBackup.useHardlinks; } - backupConfig.limits.uploadPartSize = $scope.configureBackup.uploadPartSize; + backupConfig.limits.uploadPartSize = parseInt($scope.configureBackup.uploadPartSize); if (backupConfig.format === 'rsync') { backupConfig.limits.downloadConcurrency = $scope.configureBackup.downloadConcurrency;