Merge e12a3f9c00 into bce3e54a7e

improve error handling for template upload notifications (#12412 )
Co-authored-by: Daman Arora <daman.arora@shapeblue.com>
2026-01-22 15:13:22 +01:00 · 2026-01-22 15:02:46 +01:00 · 2026-01-22 14:57:46 +01:00 · 2026-01-22 14:32:46 +01:00 · 2026-01-22 14:29:35 +01:00 · 2025-12-24 14:03:00 +05:30
10 changed files with 46 additions and 13 deletions
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
@ -78,6 +78,7 @@ public class UpdateNetworkOfferingCmd extends BaseCmd {

    @Parameter(name = ApiConstants.DOMAIN_ID,
            type = CommandType.STRING,
+            length = 4096,
            description = "The ID of the containing domain(s) as comma separated string, public for public offerings")
    private String domainIds;

--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
@ -75,6 +75,7 @@ public class UpdateDiskOfferingCmd extends BaseCmd {
    @Parameter(name = ApiConstants.ZONE_ID,
            type = CommandType.STRING,
            description = "The ID of the containing zone(s) as comma separated string, all for all zones offerings",
+            length = 4096,
            since = "4.13")
    private String zoneIds;

--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
@ -69,6 +69,7 @@ public class UpdateServiceOfferingCmd extends BaseCmd {
    @Parameter(name = ApiConstants.ZONE_ID,
            type = CommandType.STRING,
            description = "The ID of the containing zone(s) as comma separated string, all for all zones offerings",
+            length = 4096,
            since = "4.13")
    private String zoneIds;

--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
@ -65,6 +65,7 @@ public class UpdateVPCOfferingCmd extends BaseAsyncCmd {
    @Parameter(name = ApiConstants.ZONE_ID,
            type = CommandType.STRING,
            description = "The ID of the containing zone(s) as comma separated string, all for all zones offerings",
+            length = 4096,
            since = "4.13")
    private String zoneIds;

--- a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduledJobDao.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduledJobDao.java
@ -31,4 +31,6 @@ public interface VMScheduledJobDao extends GenericDao<VMScheduledJobVO, Long> {
    int expungeJobsForSchedules(List<Long> scheduleId, Date dateAfter);

    int expungeJobsBefore(Date currentTimestamp);
+
+    VMScheduledJobVO findByScheduleAndTimestamp(long scheduleId, Date scheduledTimestamp);
 }
--- a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduledJobDaoImpl.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduledJobDaoImpl.java
@ -39,6 +39,8 @@ public class VMScheduledJobDaoImpl extends GenericDaoBase<VMScheduledJobVO, Long

    private final SearchBuilder<VMScheduledJobVO> expungeJobForScheduleSearch;

+    private final SearchBuilder<VMScheduledJobVO> scheduleAndTimestampSearch;
+
    static final String SCHEDULED_TIMESTAMP = "scheduled_timestamp";

    static final String VM_SCHEDULE_ID = "vm_schedule_id";
@ -58,6 +60,11 @@ public class VMScheduledJobDaoImpl extends GenericDaoBase<VMScheduledJobVO, Long
        expungeJobForScheduleSearch.and(VM_SCHEDULE_ID, expungeJobForScheduleSearch.entity().getVmScheduleId(), SearchCriteria.Op.IN);
        expungeJobForScheduleSearch.and(SCHEDULED_TIMESTAMP, expungeJobForScheduleSearch.entity().getScheduledTime(), SearchCriteria.Op.GTEQ);
        expungeJobForScheduleSearch.done();
+
+        scheduleAndTimestampSearch = createSearchBuilder();
+        scheduleAndTimestampSearch.and(VM_SCHEDULE_ID, scheduleAndTimestampSearch.entity().getVmScheduleId(), SearchCriteria.Op.EQ);
+        scheduleAndTimestampSearch.and(SCHEDULED_TIMESTAMP, scheduleAndTimestampSearch.entity().getScheduledTime(), SearchCriteria.Op.EQ);
+        scheduleAndTimestampSearch.done();
    }

    /**
@ -92,4 +99,12 @@ public class VMScheduledJobDaoImpl extends GenericDaoBase<VMScheduledJobVO, Long
        sc.setParameters(SCHEDULED_TIMESTAMP, date);
        return expunge(sc);
    }
+
+    @Override
+    public VMScheduledJobVO findByScheduleAndTimestamp(long scheduleId, Date scheduledTimestamp) {
+        SearchCriteria<VMScheduledJobVO> sc = scheduleAndTimestampSearch.create();
+        sc.setParameters(VM_SCHEDULE_ID, scheduleId);
+        sc.setParameters(SCHEDULED_TIMESTAMP, scheduledTimestamp);
+        return findOneBy(sc);
+    }
 }
--- a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@ -135,6 +135,8 @@ public class VMSnapshotManagerImpl extends MutualExclusiveIdsManagerBase impleme

    public static final String VM_WORK_JOB_HANDLER = VMSnapshotManagerImpl.class.getSimpleName();

+    private static final String ERROR_STRATEGY_NOT_FOUND = "Can't find Instance Snapshot strategy for instance snapshot";
+
    @Inject
    VMInstanceDao _vmInstanceDao;
    @Inject ServiceOfferingDetailsDao _serviceOfferingDetailsDao;
@ -501,7 +503,7 @@ public class VMSnapshotManagerImpl extends MutualExclusiveIdsManagerBase impleme
        VMSnapshotStrategy snapshotStrategy = storageStrategyFactory.getVmSnapshotStrategy(vmSnapshot);

        if (snapshotStrategy == null) {
-            throw new CloudRuntimeException(String.format("Can't find Instance Snapshot strategy for vmsnapshot: %s", vmSnapshot));
+            throw new CloudRuntimeException(String.format("%s: %s", ERROR_STRATEGY_NOT_FOUND, vmSnapshot));
        }

        return snapshotStrategy;
@ -596,6 +598,13 @@ public class VMSnapshotManagerImpl extends MutualExclusiveIdsManagerBase impleme
        } catch (Exception e) {
            String errMsg = String.format("Failed to create Instance Snapshot: [%s] due to: %s", vmSnapshot, e.getMessage());
            logger.debug(errMsg, e);
+            if (e instanceof CloudRuntimeException) {
+                CloudRuntimeException cre = (CloudRuntimeException)e;
+                if (cre.getMessage().startsWith(ERROR_STRATEGY_NOT_FOUND) && VMSnapshot.State.Error.equals(vmSnapshot.getState())) {
+                    logger.debug("No instance snapshot strategy found for {}, remove it from DB", vmSnapshot);
+                    _vmSnapshotDao.remove(vmSnapshot.getId());
+                }
+            }
            throw new CloudRuntimeException(errMsg, e);
        }
    }
--- a/server/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedulerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedulerImpl.java
@ -162,7 +162,13 @@ public class VMSchedulerImpl extends ManagerBase implements VMScheduler, Configu
        }

        Date scheduledDateTime = Date.from(ts.toInstant());
-        VMScheduledJobVO scheduledJob = new VMScheduledJobVO(vmSchedule.getVmId(), vmSchedule.getId(), vmSchedule.getAction(), scheduledDateTime);
+        VMScheduledJobVO scheduledJob = vmScheduledJobDao.findByScheduleAndTimestamp(vmSchedule.getId(), scheduledDateTime);
+        if (scheduledJob != null) {
+            logger.trace("Job is already scheduled for schedule {} at {}", vmSchedule, scheduledDateTime);
+            return scheduledDateTime;
+        }
+
+        scheduledJob = new VMScheduledJobVO(vmSchedule.getVmId(), vmSchedule.getId(), vmSchedule.getAction(), scheduledDateTime);
        try {
            vmScheduledJobDao.persist(scheduledJob);
            ActionEventUtils.onScheduledActionEvent(User.UID_SYSTEM, vm.getAccountId(), actionEventMap.get(vmSchedule.getAction()),
--- a/ui/src/utils/plugins.js
+++ b/ui/src/utils/plugins.js
@ -218,18 +218,19 @@ export const notifierPlugin = {
        if (error.response.status) {
          msg = `${i18n.global.t('message.request.failed')} (${error.response.status})`
        }
-        if (error.message) {
-          desc = error.message
-        }
-        if (error.response.headers && 'x-description' in error.response.headers) {
+        if (error.response.headers?.['x-description']) {
          desc = error.response.headers['x-description']
-        }
-        if (desc === '' && error.response.data) {
+        } else if (error.response.data) {
          const responseKey = _.findKey(error.response.data, 'errortext')
          if (responseKey) {
            desc = error.response.data[responseKey].errortext
+          } else if (typeof error.response.data === 'string') {
+            desc = error.response.data
          }
        }
+        if (!desc && error.message) {
+          desc = error.message
+        }
      }
      let countNotify = store.getters.countNotify
      countNotify++
--- a/ui/src/views/image/RegisterOrUploadTemplate.vue
+++ b/ui/src/views/image/RegisterOrUploadTemplate.vue
@ -638,11 +638,7 @@ export default {
        this.$emit('refresh-data')
        this.closeAction()
      }).catch(e => {
-        this.$notification.error({
-          message: this.$t('message.upload.failed'),
-          description: `${this.$t('message.upload.template.failed.description')} -  ${e}`,
-          duration: 0
-        })
+        this.$notifyError(e)
      })
    },
    fetchCustomHypervisorName () {
Author	SHA1	Message	Date
Abhishek Kumar	7c97c202ea	Merge `e12a3f9c00` into `bce3e54a7e`	2026-01-22 15:13:22 +01:00
Daman Arora	bce3e54a7e	improve error handling for template upload notifications (#12412 ) Co-authored-by: Daman Arora <daman.arora@shapeblue.com>	2026-01-22 15:02:46 +01:00
Nicolas Vazquez	6a9835904c	Fix for zoneids parameters length on updateAPIs (#12440 )	2026-01-22 14:57:46 +01:00
Nicolas Vazquez	6846619a6f	Fix update network offering domainids size limitation (#12431 )	2026-01-22 14:32:46 +01:00
Vishesh	d1eb2822d9	Remove redundant Exceptions from logs for vm schedules (#12428 )	2026-01-22 14:29:35 +01:00
Abhishek Kumar	e12a3f9c00	Merge branch '4.20' into fix-vmsnap-delete	2025-12-24 14:03:00 +05:30
Abhishek Kumar	92f7a5754f	server: delete errored instance snapshot from db when no strategy DB entries for instance snapshot are created when no strategy is found. When deleting such entries later, again error is seen. Therefore, it is better to remove the entry immediately. Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>	2025-09-01 15:10:33 +05:30