From 194b44c1cc814679dea448c273aca4d498c19736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Jandre?= <48719461+JoaoJandre@users.noreply.github.com> Date: Fri, 11 Jul 2025 09:38:19 -0300 Subject: [PATCH 1/3] improve logging --- .../java/org/apache/cloudstack/backup/BackupManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java index 68b6a2ad0470..e2f620b14cdf 100644 --- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java @@ -131,6 +131,8 @@ import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; import com.google.gson.Gson; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; public class BackupManagerImpl extends ManagerBase implements BackupManager { @@ -1071,7 +1073,7 @@ private boolean attachVolumeToVM(Long zoneId, String restoredVolumeLocation, Lis } volumeInfo.setType(Volume.Type.DATADISK); - logger.debug("Attaching the restored volume to VM {}", vm); + logger.debug("Attaching the restored volume {} to VM {}.", () -> ReflectionToStringBuilder.toString(volumeInfo, ToStringStyle.JSON_STYLE), () -> vm); StoragePoolVO pool = primaryDataStoreDao.findByUuid(datastoreUuid); try { return guru.attachRestoredVolumeToVirtualMachine(zoneId, restoredVolumeLocation, volumeInfo, vm, pool.getId(), backup); From 2bb23e372add865174f3fe120d0695bb1c363e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Jandre?= <48719461+JoaoJandre@users.noreply.github.com> Date: Mon, 14 Jul 2025 11:51:40 -0300 Subject: [PATCH 2/3] address reviews --- .../java/org/apache/cloudstack/backup/BackupManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java index e2f620b14cdf..068e8a173ebe 100644 --- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java @@ -1073,7 +1073,7 @@ private boolean attachVolumeToVM(Long zoneId, String restoredVolumeLocation, Lis } volumeInfo.setType(Volume.Type.DATADISK); - logger.debug("Attaching the restored volume {} to VM {}.", () -> ReflectionToStringBuilder.toString(volumeInfo, ToStringStyle.JSON_STYLE), () -> vm); + logger.info("Attaching the restored volume {} to VM {}.", () -> ReflectionToStringBuilder.toString(volumeInfo, ToStringStyle.JSON_STYLE), () -> vm); StoragePoolVO pool = primaryDataStoreDao.findByUuid(datastoreUuid); try { return guru.attachRestoredVolumeToVirtualMachine(zoneId, restoredVolumeLocation, volumeInfo, vm, pool.getId(), backup); From 7514d7221716765b3fa6adefd2269c6eded505dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Jandre?= <48719461+JoaoJandre@users.noreply.github.com> Date: Fri, 1 Aug 2025 08:18:25 -0300 Subject: [PATCH 3/3] fix rename --- .../java/org/apache/cloudstack/backup/BackupManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java index 47a93eeda50d..6d4d58dde145 100644 --- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java @@ -1526,7 +1526,7 @@ private boolean attachVolumeToVM(Long zoneId, String restoredVolumeLocation, Bac HypervisorGuru guru = hypervisorGuruManager.getGuru(vm.getHypervisorType()); backupVolumeInfo.setType(Volume.Type.DATADISK); - logger.info("Attaching the restored volume {} to VM {}.", () -> ReflectionToStringBuilder.toString(volumeInfo, ToStringStyle.JSON_STYLE), () -> vm); + logger.info("Attaching the restored volume {} to VM {}.", () -> ReflectionToStringBuilder.toString(backupVolumeInfo, ToStringStyle.JSON_STYLE), () -> vm); StoragePoolVO pool = primaryDataStoreDao.findByUuid(datastoreUuid); try { return guru.attachRestoredVolumeToVirtualMachine(zoneId, restoredVolumeLocation, backupVolumeInfo, vm, pool.getId(), backup);