From fb3b0872dd9fd072fecc15add3244d48ea08811e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Jandre?= <48719461+JoaoJandre@users.noreply.github.com> Date: Thu, 20 Aug 2026 16:49:36 -0300 Subject: [PATCH 1/2] fix not informing jobtype --- .../cloudstack/backup/dao/InternalBackupServiceJobDao.java | 2 +- .../backup/dao/InternalBackupServiceJobDaoImpl.java | 4 ++-- .../src/main/java/com/cloud/api/query/QueryManagerImpl.java | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupServiceJobDao.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupServiceJobDao.java index c80734b9cb3c..01a23206aca2 100644 --- a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupServiceJobDao.java +++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupServiceJobDao.java @@ -32,7 +32,7 @@ public interface InternalBackupServiceJobDao extends GenericDao listExecutingJobsByHostsAndStartTimeBeforeAndTypeIn(Object[] hostIds, Date date, InternalBackupServiceJobType... jobTypes); - Pair, Integer> searchAndCountForListApi(Long id, Long backupId, Long hostId, Long zoneId, InternalBackupServiceJobType type, boolean executing, + Pair, Integer> searchAndCountForListApi(Long id, Long backupId, Long hostId, Long zoneId, String type, boolean executing, boolean scheduled, Long startIndex, Long pageSize); void update(InternalBackupServiceJobVO job); diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupServiceJobDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupServiceJobDaoImpl.java index 32e81261838d..d724539dcf3a 100644 --- a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupServiceJobDaoImpl.java +++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupServiceJobDaoImpl.java @@ -98,7 +98,7 @@ public List listExecutingJobsByHostsAndStartTimeBefo } @Override - public Pair, Integer> searchAndCountForListApi(Long id, Long backupId, Long hostId, Long zoneId, InternalBackupServiceJobType type, boolean executing, + public Pair, Integer> searchAndCountForListApi(Long id, Long backupId, Long hostId, Long zoneId, String type, boolean executing, boolean scheduled, Long startIndex, Long pageSize) { SearchBuilder sb = createSearchBuilder(); @@ -122,7 +122,7 @@ public Pair, Integer> searchAndCountForListApi( sc.setParametersIfNotNull(HOST_ID, hostId); sc.setParametersIfNotNull(ZONE_ID, zoneId); if (type != null) { - sc.setParameters(TYPE, type); + sc.setParameters(TYPE, InternalBackupServiceJobType.valueOf(type)); } Filter filter = new Filter(InternalBackupServiceJobVO.class, "created", false, startIndex, pageSize); diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index d11913262818..a3b50e077feb 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -158,7 +158,6 @@ import org.apache.cloudstack.api.response.VirtualMachineResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.cloudstack.backup.InternalBackupServiceJobType; import org.apache.cloudstack.backup.InternalBackupServiceJobVO; import org.apache.cloudstack.backup.BackupOfferingVO; import org.apache.cloudstack.backup.BackupVO; @@ -6400,7 +6399,7 @@ public ListResponse listBackupServiceJobs(ListBackupSe private Pair, Integer> listBackupServiceJobsInternal(ListBackupServiceJobsCmd cmd) { return internalBackupServiceJobDao.searchAndCountForListApi(cmd.getId(), cmd.getBackupId(), cmd.getHostId(), cmd.getZoneId(), - InternalBackupServiceJobType.valueOf(cmd.getType()), cmd.getExecuting(), cmd.getScheduled(), cmd.getStartIndex(), cmd.getPageSizeVal()); + cmd.getType(), cmd.getExecuting(), cmd.getScheduled(), cmd.getStartIndex(), cmd.getPageSizeVal()); } @Override From f1f1febd2b97084241cdb35d555376789eab43bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Jandre?= <48719461+JoaoJandre@users.noreply.github.com> Date: Thu, 20 Aug 2026 16:57:18 -0300 Subject: [PATCH 2/2] change name to generic job --- .../src/main/java/com/cloud/api/query/QueryManagerImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index a3b50e077feb..a4af6061902c 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -6378,7 +6378,7 @@ private List searchForBucketsInternal(ListBucketsCmd cmd) { public ListResponse listBackupServiceJobs(ListBackupServiceJobsCmd cmd) { ListResponse responses = new ListResponse<>(); Pair, Integer> result = listBackupServiceJobsInternal(cmd); - List compressionJobResponses = new ArrayList<>(); + List backupServiceJobResponses = new ArrayList<>(); for (InternalBackupServiceJobVO jobVO : result.first()) { BackupVO backup = backupDao.findByIdIncludingRemoved(jobVO.getBackupId()); @@ -6390,10 +6390,10 @@ public ListResponse listBackupServiceJobs(ListBackupSe if (jobVO.getHostId() != null) { response.setHostId(hostDao.findByIdIncludingRemoved(jobVO.getHostId()).getUuid()); } - compressionJobResponses.add(response); + backupServiceJobResponses.add(response); } - responses.setResponses(compressionJobResponses, result.second()); + responses.setResponses(backupServiceJobResponses, result.second()); return responses; }