File tree Expand file tree Collapse file tree
server/src/main/java/org/apache/cloudstack/backup Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1827,9 +1827,9 @@ public BackupProvider getBackupProvider(final Long zoneId) {
18271827 }
18281828
18291829 public BackupProvider getBackupProvider (final String name ) {
1830- if (StringUtils .isEmpty (name )) {
1831- throw new CloudRuntimeException ("Invalid backup provider name provided" );
1832- }
1830+ if (StringUtils .isEmpty (name )) {
1831+ throw new CloudRuntimeException ("Invalid backup provider name provided" );
1832+ }
18331833 if (!backupProvidersMap .containsKey (name )) {
18341834 throw new CloudRuntimeException ("Failed to find backup provider by the name: " + name );
18351835 }
Original file line number Diff line number Diff line change @@ -139,9 +139,12 @@ public class KVMBackupExportServiceImpl extends ManagerBase implements KVMBackup
139139 VmWorkJobHandlerProxy jobHandlerProxy = new VmWorkJobHandlerProxy (this );
140140
141141 private void verifyKVMBackupExportServiceSupported (Long zoneId ) {
142- if (BackupFrameworkEnabled .value () && !StringUtils .equals ("dummy" , BackupProviderPlugin .valueIn (zoneId ))) {
143- throw new CloudRuntimeException ("Veeam-KVM integration can not be used along with the " + BackupProviderPlugin .valueIn (zoneId ) +
144- " backup provider. Either set backup.framework.enabled to false or set the Zone level config backup.framework.provider.plugin to \" dummy\" ." );
142+ if (BackupFrameworkEnabled .value () &&
143+ !StringUtils .equals ("dummy" , BackupProviderPlugin .valueIn (zoneId )) &&
144+ !StringUtils .equals ("veeam" , BackupProviderPlugin .valueIn (zoneId ))) {
145+ throw new CloudRuntimeException ("Veeam-KVM backups are disabled because the CloudStack Zone is configured to use the \" " +
146+ BackupProviderPlugin .valueIn (zoneId ) + "\" backup provider. Acceptable \" backup.framework.provider.plugin\" " +
147+ "values are [\" veeam\" , \" dummy\" ]. Refer to documentation for more details on backup providers compatibility." );
145148 }
146149 }
147150
You can’t perform that action at this time.
0 commit comments