Cleanup

Author: nvazquez

server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java

@@ -24,8 +24,6 @@
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.ClusterDetailsVO;
 import com.cloud.dc.ClusterVO;
-import com.cloud.dc.DataCenterVO;
-import com.cloud.dc.HostPodVO;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.dc.dao.HostPodDao;
@@ -39,7 +37,6 @@
 import com.cloud.host.dao.HostDao;
 import com.cloud.host.dao.HostTagsDao;
 import com.cloud.hypervisor.Hypervisor;
-import com.cloud.org.Cluster;
 import com.cloud.service.ServiceOfferingVO;
 import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.utils.Pair;
@@ -322,171 +319,11 @@ private Set<Host> getHostsListForRollingMaintenance(ResourceType type, List<Long
         return hosts;
     }
 
-    /**
-     * Invoke rolling maintenance from an entity and type
-     */
-    private Pair<Boolean, String> rollingMaintenance(RollingMaintenanceEntity entity, ResourceType type, long timeout, String payload, Boolean forced) {
-        if (entity instanceof HostPodVO && type == ResourceType.Pod) {
-            HostPodVO podVO = (HostPodVO) entity;
-            return rollingMaintenancePod(podVO, timeout, payload, forced);
-        } else if (entity instanceof DataCenterVO && type == ResourceType.Zone) {
-            DataCenterVO dataCenterVO = (DataCenterVO) entity;
-            return rollingMaintenanceZone(dataCenterVO, timeout, payload, forced);
-        } else if (entity instanceof ClusterVO && type == ResourceType.Cluster) {
-            ClusterVO clusterVO = (ClusterVO) entity;
-            return rollingMaintenanceCluster(clusterVO, timeout, payload, forced);
-        } else if (entity instanceof HostVO && type == ResourceType.Host) {
-            HostVO hostVO = (HostVO) entity;
-            if (hostVO.getState() != Status.Up) {
-                return new Pair<>(false, "Host " + hostVO.getUuid() + " is not in Up state");
-            }
-            return rollingMaintenanceHost(hostVO, timeout, payload);
-        }
-        throw new CloudRuntimeException("Unrecognized entity with type: " + type);
-    }
-
-    /**
-     * Retrieve an entity from its type and ID
-     */
-    private RollingMaintenanceEntity getEntity(ResourceType type, Long entityId) {
-        s_logger.debug("Searching for entity with ID: " + entityId + " and type: " + type);
-        RollingMaintenanceEntity entity = null;
-        if (type == ResourceType.Pod) {
-            entity = podDao.findById(entityId);
-        } else if (type == ResourceType.Cluster) {
-            entity = clusterDao.findById(entityId);
-        } else if (type == ResourceType.Zone) {
-            entity = dataCenterDao.findById(entityId);
-        } else if (type == ResourceType.Host) {
-            entity = hostDao.findById(entityId);
-        } else {
-            throw new CloudRuntimeException("Unknown resource type: " + type);
-        }
-        if (entity == null) {
-            throw new CloudRuntimeException("Could not find " + type + " with ID: " + entityId);
-        }
-        return entity;
-    }
-
     @Override
     public Pair<ResourceType, List<Long>> getResourceTypeIdPair(StartRollingMaintenanceCmd cmd) {
         return getResourceTypeAndIdPair(cmd.getPodIds(), cmd.getClusterIds(), cmd.getZoneIds(), cmd.getHostIds());
     }
 
-    /*
-        Rolling maintenance for the hosts in the zone, iterating though its pods and clusters
-     */
-    private Pair<Boolean, String> rollingMaintenanceZone(DataCenterVO zoneVO, long timeout, String payload, Boolean forced) {
-        List<HostPodVO> pods = podDao.listByDataCenterId(zoneVO.getId());
-        for (HostPodVO pod : pods) {
-            Pair<Boolean, String> result = rollingMaintenancePod(pod, timeout, payload, forced);
-            if (!result.first()) {
-                s_logger.error("Error on rolling maintenance for zone " + zoneVO.getUuid() + " while processing " +
-                        "pod " + pod.getUuid());
-                return result;
-            }
-        }
-        return new Pair<> (true, "OK");
-    }
-
-    /*
-        Rolling maintenance for the hosts in a pod, iterating through its clusters
-     */
-    private Pair<Boolean, String> rollingMaintenancePod(HostPodVO podVO, long timeout, String payload, Boolean forced) {
-        List<ClusterVO> clusters = clusterDao.listByPodId(podVO.getId());
-        for (ClusterVO cluster : clusters) {
-            Pair<Boolean, String> result = rollingMaintenanceCluster(cluster, timeout, payload, forced);
-            if (!result.first()) {
-                s_logger.error("Error on rolling maintenance for pod " + podVO.getUuid() + " while processing " +
-                        "hosts from cluster " + cluster.getUuid());
-                return result;
-            }
-        }
-        return new Pair<> (true, "OK");
-    }
-
-    /*
-        Rolling maintenance for the hosts in a cluster
-     */
-    protected Pair<Boolean, String> rollingMaintenanceCluster(Cluster cluster, long timeout, String payload, Boolean forced) {
-        if (cluster.getHypervisorType() != Hypervisor.HypervisorType.KVM) {
-            throw new CloudRuntimeException(unsopportedHypervisorErrorMsg);
-        }
-        List<HostVO> clusterHosts = hostDao.listByClusterAndHypervisorType(cluster.getId(), cluster.getHypervisorType());
-        for (HostVO host: clusterHosts) {
-            if (host.getState() != Status.Up) {
-                s_logger.debug("Host " + host.getUuid() + " is not in Up state, skipping on rolling maintenance");
-                continue;
-            }
-            Pair<Boolean, String> result = rollingMaintenanceHost(host, timeout, payload);
-            if (!result.first()) {
-                if (forced) {
-                    s_logger.warn("Rolling maintenance failed for host " + host.getUuid() + " but forced flag is enabled," +
-                            "continuing with the next host...");
-                } else {
-                    return result;
-                }
-            }
-        }
-        return new Pair<> (true, "OK");
-    }
-
-    /**
-     * Rolling maintenance for a host. It is perform in 4 stages:
-     * - Pre-flight
-     * - Pre-maintenance
-     * - Maintenance
-     * - Post-maintenance
-     */
-    protected Pair<Boolean, String> rollingMaintenanceHost(Host host, long timeout, String payload) {
-        s_logger.debug("Starting rolling maintenance on host " + host.getUuid());
-
-        Stage stage = Stage.PreFlight;
-        try {
-            while (stage != null) {
-                s_logger.debug("Performing stage " + stage + " on host " + host.getUuid());
-                Pair<Boolean, String> result = performRollingMaintenanceStage(host, stage, timeout, payload);
-                if (!result.first()) {
-                    String msg = "Error on rolling maintenance for host: " + host.getUuid() + ", stage: " + stage
-                            + ", details: " + result.second();
-                    s_logger.error(msg);
-                    return new Pair<>(false, msg);
-                }
-                s_logger.debug("Stage " + stage + " succeeded on host " + host.getUuid());
-                stage = stage.next();
-            }
-        } catch (AgentUnavailableException | CloudRuntimeException | InterruptedException e) {
-            String msg = "Unable to perform rolling maintenance stage " + stage + " on host " + host.getUuid()
-                    + ": " + e.getMessage();
-            s_logger.error(msg, e);
-            return new Pair<>(false, msg);
-        }
-        return new Pair<>(true, "OK");
-    }
-
-    /*
-        Perform the rolling maintenance stage for a host
-     */
-    protected Pair<Boolean, String> performRollingMaintenanceStage(Host host, Stage stage, long timeout, String payload) throws AgentUnavailableException, CloudRuntimeException, InterruptedException {
-        if (stage == Stage.Maintenance) {
-            s_logger.debug("Trying to set the host " + host.getId() + " into maintenance");
-            resourceManager.maintain(host.getId());
-            waitForHostInMaintenance(host.getId());
-        } else if (stage == Stage.PostMaintenance) {
-            boolean success = resourceManager.cancelMaintenance(host.getId());
-            if (!success) {
-                s_logger.error("Could not cancel maintenance on host " + host.getUuid());
-            }
-        }
-
-        s_logger.info("Rolling maintenance for host " + host.getUuid() + " stage = " + stage);
-        RollingMaintenanceCommand cmd = new RollingMaintenanceCommand(stage.toString());
-        cmd.setTimeout(timeout);
-        cmd.setPayload(payload);
-
-        return sendRollingMaintenanceCommandToHost(host, cmd, timeout, payload);
-    }
-
     /*
         Wait for to be in maintenance mode
      */