Merge branch 'backup-schedules-general-fixes' into '4.20.0.0-scclouds'

Ajustes em fluxos de agendamentos de _backups_

Closes #2935, #3021, #3024, and #3037

See merge request scclouds/scclouds!1294

Author: Fabrício Duarte

api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java

@@ -19,28 +19,18 @@
 
 import javax.inject.Inject;
 
-import com.amazonaws.util.CollectionUtils;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.BackupScheduleResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
 import org.apache.cloudstack.backup.BackupManager;
 import org.apache.cloudstack.backup.BackupSchedule;
 import org.apache.cloudstack.context.CallContext;
 
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.NetworkRuleConflictException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.utils.exception.CloudRuntimeException;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -77,24 +67,16 @@ public Long getVmId() {
     /////////////////////////////////////////////////////
 
     @Override
-    public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
-        try{
-            List<BackupSchedule> schedules = backupManager.listBackupSchedule(getVmId());
-            ListResponse<BackupScheduleResponse> response = new ListResponse<>();
-            List<BackupScheduleResponse> scheduleResponses = new ArrayList<>();
-            if (!CollectionUtils.isNullOrEmpty(schedules)) {
-                for (BackupSchedule schedule : schedules) {
-                    scheduleResponses.add(_responseGenerator.createBackupScheduleResponse(schedule));
-                }
-                response.setResponses(scheduleResponses, schedules.size());
-                response.setResponseName(getCommandName());
-                setResponseObject(response);
-            } else {
-                throw new CloudRuntimeException("No backup schedule exists for the VM");
-            }
-        } catch (Exception e) {
-            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+    public void execute() {
+        List<BackupSchedule> schedules = backupManager.listBackupSchedules(getVmId());
+        ListResponse<BackupScheduleResponse> response = new ListResponse<>();
+        List<BackupScheduleResponse> scheduleResponses = new ArrayList<>();
+        for (BackupSchedule schedule : schedules) {
+            scheduleResponses.add(_responseGenerator.createBackupScheduleResponse(schedule));
         }
+        response.setResponses(scheduleResponses, schedules.size());
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/backup/BackupManager.java

@@ -106,11 +106,11 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
     BackupSchedule configureBackupSchedule(CreateBackupScheduleCmd cmd);
 
     /**
-     * Lists VM backup schedule for a VM
-     * @param vmId
+     * Lists backup schedules for a VM
+     * @param vmId ID of the VM from which all backup schedules will be listed
      * @return
      */
-    List<BackupSchedule> listBackupSchedule(Long vmId);
+    List<BackupSchedule> listBackupSchedules(Long vmId);
 
     /**
      * Deletes a VM backup schedule for a VM

engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDao.java

@@ -21,20 +21,14 @@
 import java.util.List;
 
 import com.cloud.utils.DateUtil;
-import org.apache.cloudstack.api.response.BackupScheduleResponse;
-import org.apache.cloudstack.backup.BackupSchedule;
 import org.apache.cloudstack.backup.BackupScheduleVO;
 
 import com.cloud.utils.db.GenericDao;
 
 public interface BackupScheduleDao extends GenericDao<BackupScheduleVO, Long> {
-    BackupScheduleVO findByVM(Long vmId);
-
     List<BackupScheduleVO> listByVM(Long vmId);
 
     BackupScheduleVO findByVMAndIntervalType(Long vmId, DateUtil.IntervalType intervalType);
 
     List<BackupScheduleVO> getSchedulesToExecute(Date currentTimestamp);
-
-    BackupScheduleResponse newBackupScheduleResponse(BackupSchedule schedule);
 }

engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDaoImpl.java

@@ -17,21 +17,22 @@
 
 package org.apache.cloudstack.backup.dao;
 
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.Date;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.utils.DateUtil;
-import org.apache.cloudstack.api.response.BackupScheduleResponse;
-import org.apache.cloudstack.backup.BackupSchedule;
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.TransactionLegacy;
 import org.apache.cloudstack.backup.BackupScheduleVO;
 
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.dao.VMInstanceDao;
 
 public class BackupScheduleDaoImpl extends GenericDaoBase<BackupScheduleVO, Long> implements BackupScheduleDao {
@@ -59,13 +60,6 @@ protected void init() {
         executableSchedulesSearch.done();
     }
 
-    @Override
-    public BackupScheduleVO findByVM(Long vmId) {
-        SearchCriteria<BackupScheduleVO> sc = backupScheduleSearch.create();
-        sc.setParameters("vm_id", vmId);
-        return findOneBy(sc);
-    }
-
     @Override
     public List<BackupScheduleVO> listByVM(Long vmId) {
         SearchCriteria<BackupScheduleVO> sc = backupScheduleSearch.create();
@@ -89,18 +83,17 @@ public List<BackupScheduleVO> getSchedulesToExecute(Date currentTimestamp) {
     }
 
     @Override
-    public BackupScheduleResponse newBackupScheduleResponse(BackupSchedule schedule) {
-        VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(schedule.getVmId());
-        BackupScheduleResponse response = new BackupScheduleResponse();
-        response.setId(schedule.getUuid());
-        response.setVmId(vm.getUuid());
-        response.setVmName(vm.getHostName());
-        response.setIntervalType(schedule.getScheduleType());
-        response.setSchedule(schedule.getSchedule());
-        response.setTimezone(schedule.getTimezone());
-        response.setQuiesceVm(schedule.isQuiesceVm());
-        response.setMaxBackups(schedule.getMaxBackups());
-        response.setObjectName("backupschedule");
-        return response;
+    @DB
+    public boolean remove(Long id) {
+        String sql = "UPDATE backups SET backup_schedule_id = NULL WHERE backup_schedule_id = ?";
+        TransactionLegacy transaction = TransactionLegacy.currentTxn();
+        try {
+            PreparedStatement preparedStatement = transaction.prepareAutoCloseStatement(sql);
+            preparedStatement.setLong(1, id);
+            preparedStatement.executeUpdate();
+            return super.remove(id);
+        } catch (SQLException e) {
+            return false;
+        }
     }
 }

server/src/main/java/com/cloud/api/ApiDBUtils.java

@@ -47,7 +47,6 @@
 import org.apache.cloudstack.api.response.AsyncJobResponse;
 import org.apache.cloudstack.api.response.BackupOfferingResponse;
 import org.apache.cloudstack.api.response.BackupResponse;
-import org.apache.cloudstack.api.response.BackupScheduleResponse;
 import org.apache.cloudstack.api.response.DiskOfferingResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.DomainRouterResponse;
@@ -78,7 +77,6 @@
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.backup.Backup;
 import org.apache.cloudstack.backup.BackupOffering;
-import org.apache.cloudstack.backup.BackupSchedule;
 import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.backup.dao.BackupOfferingDao;
 import org.apache.cloudstack.backup.dao.BackupScheduleDao;
@@ -491,7 +489,6 @@ public class ApiDBUtils {
     static HostGpuGroupsDao s_hostGpuGroupsDao;
     static VGPUTypesDao s_vgpuTypesDao;
     static BackupDao s_backupDao;
-    static BackupScheduleDao s_backupScheduleDao;
     static BackupOfferingDao s_backupOfferingDao;
     static NicDao s_nicDao;
     static ResourceManagerUtil s_resourceManagerUtil;
@@ -900,7 +897,6 @@ void init() {
         s_hostGpuGroupsDao = hostGpuGroupsDao;
         s_vgpuTypesDao = vgpuTypesDao;
         s_backupDao = backupDao;
-        s_backupScheduleDao = backupScheduleDao;
         s_backupOfferingDao = backupOfferingDao;
         s_resourceIconDao = resourceIconDao;
         s_resourceManagerUtil = resourceManagerUtil;
@@ -2292,10 +2288,6 @@ public static BackupResponse newBackupResponse(Backup backup) {
         return s_backupDao.newBackupResponse(backup);
     }
 
-    public static BackupScheduleResponse newBackupScheduleResponse(BackupSchedule schedule) {
-        return s_backupScheduleDao.newBackupScheduleResponse(schedule);
-    }
-
     public static BackupOfferingResponse newBackupOfferingResponse(BackupOffering policy) {
         return s_backupOfferingDao.newBackupOfferingResponse(policy);
     }

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -5029,7 +5029,22 @@ public BackupResponse createBackupResponse(Backup backup) {
 
     @Override
     public BackupScheduleResponse createBackupScheduleResponse(BackupSchedule schedule) {
-        return ApiDBUtils.newBackupScheduleResponse(schedule);
+        BackupScheduleResponse response = new BackupScheduleResponse();
+        response.setId(schedule.getUuid());
+        response.setIntervalType(schedule.getScheduleType());
+        response.setSchedule(schedule.getSchedule());
+        response.setTimezone(schedule.getTimezone());
+        response.setQuiesceVm(schedule.isQuiesceVm());
+        response.setMaxBackups(schedule.getMaxBackups());
+
+        VMInstanceVO vm = ApiDBUtils.findVMInstanceById(schedule.getVmId());
+        if (vm != null) {
+            response.setVmId(vm.getUuid());
+            response.setVmName(vm.getHostName());
+        }
+
+        response.setObjectName("backupschedule");
+        return response;
     }
 
     @Override

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -491,7 +491,7 @@ public BackupSchedule configureBackupSchedule(CreateBackupScheduleCmd cmd) {
         schedule.setQuiesceVm(quiesceVm);
         schedule.setMaxBackups(maxBackups);
         backupScheduleDao.update(schedule.getId(), schedule);
-        return backupScheduleDao.findByVM(vmId);
+        return backupScheduleDao.findById(schedule.getId());
     }
 
     /**
@@ -519,7 +519,7 @@ protected int validateAndGetDefaultBackupRetentionIfRequired(Integer maxBackups,
     }
 
     @Override
-    public List<BackupSchedule> listBackupSchedule(final Long vmId) {
+    public List<BackupSchedule> listBackupSchedules(final Long vmId) {
         final VMInstanceVO vm = findVmById(vmId);
         validateForZone(vm.getDataCenterId());
         accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);

ui/src/views/compute/backup/BackupSchedule.vue

@@ -44,11 +44,8 @@
         <template v-if="column.key === 'intervaltype'" :name="text">
           <label>{{ record.intervaltype }}</label>
         </template>
-        <template v-if="column.key === 'time'" :name="text">
-          <label class="interval-content">
-            <span v-if="record.intervaltype==='HOURLY'">{{ record.schedule + ' ' + $t('label.min.past.hour') }}</span>
-            <span v-else>{{ record.schedule.split(':')[1] + ':' + record.schedule.split(':')[0] }}</span>
-          </label>
+        <template v-if="column.key === 'schedule'" :name="text">
+          <span>{{ parseScheduleTime(record.schedule, record.intervaltype) }}</span>
         </template>
         <template v-if="column.key === 'interval'" :name="text">
           <span v-if="record.intervaltype==='WEEKLY'">
@@ -129,7 +126,8 @@ export default {
         },
         {
           title: this.$t('label.time'),
-          dataIndex: 'schedule'
+          dataIndex: 'schedule',
+          key: 'schedule'
         },
         {
           key: 'interval',
@@ -196,6 +194,14 @@ export default {
     },
     getTimeZone (timeZone) {
       return timeZoneName(timeZone)
+    },
+    parseScheduleTime (schedule, intervalType) {
+      if (intervalType === 'HOURLY') {
+        return schedule
+      }
+
+      const [minute, hour] = schedule.split(':')
+      return `${hour}:${minute}`
     }
   }
 }