From 56ab08f85a25f0af1b0c40addf846d07eb9110f0 Mon Sep 17 00:00:00 2001
From: Pierre Charton
Date: Wed, 11 Sep 2024 18:01:05 +0200
Subject: [PATCH] Fix pom and restoreBackedUpVolume
---
plugins/backup/backroll/pom.xml | 10 ----------
.../cloudstack/backup/BackrollBackupProvider.java | 11 ++++++-----
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/plugins/backup/backroll/pom.xml b/plugins/backup/backroll/pom.xml
index 925cbc7a9e7..5f7718c129f 100644
--- a/plugins/backup/backroll/pom.xml
+++ b/plugins/backup/backroll/pom.xml
@@ -41,15 +41,5 @@
org.json
json
-
- org.apache.logging.log4j
- log4j-api
- 2.13.3
-
-
- org.apache.logging.log4j
- log4j-core
- 2.13.3
-
diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java
index 67fda227b43..86dbcd5a4a6 100644
--- a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java
+++ b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java
@@ -115,11 +115,6 @@ public class BackrollBackupProvider extends AdapterBase implements BackupProvide
return isSuccess;
}
- @Override
- public Pair restoreBackedUpVolume(Backup backup, String volumeUuid, String hostIp, String dataStoreUuid, Pair vmNameAndState) {
- throw new CloudRuntimeException("Backroll plugin does not support this feature");
- }
-
@Override
public Map getBackupMetrics(Long zoneId, List vms) {
final Map metrics = new HashMap<>();
@@ -380,4 +375,10 @@ public class BackrollBackupProvider extends AdapterBase implements BackupProvide
private String getBackupName(Backup backup) {
return backup.getExternalId().substring(backup.getExternalId().indexOf(",") + 1);
}
+
+ @Override
+ public Pair restoreBackedUpVolume(Backup backup, String volumeUuid, String hostIp, String dataStoreUuid, Pair vmNameAndState) {
+ logger.debug("Restoring volume {} from backup {} on the Backroll Backup Provider", volumeUuid, backup.getUuid());
+ throw new CloudRuntimeException("Backroll plugin does not support this feature");
+ }
}