cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mike-tutkowski <...@git.apache.org>
Subject [GitHub] cloudstack pull request: Taking fast and efficient volume snapshot...
Date Fri, 13 May 2016 04:21:29 GMT
Github user mike-tutkowski commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/1403#discussion_r63131882
  
    --- Diff: engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
---
    @@ -55,65 +68,98 @@
     import com.cloud.host.Host;
     import com.cloud.host.HostVO;
     import com.cloud.host.dao.HostDao;
    +import com.cloud.host.dao.HostDetailsDao;
     import com.cloud.hypervisor.Hypervisor.HypervisorType;
    -import com.cloud.org.Cluster;
    -import com.cloud.org.Grouping.AllocationState;
    -import com.cloud.resource.ResourceState;
     import com.cloud.server.ManagementService;
     import com.cloud.storage.DataStoreRole;
     import com.cloud.storage.DiskOfferingVO;
     import com.cloud.storage.SnapshotVO;
     import com.cloud.storage.Storage.ImageFormat;
    +import com.cloud.storage.VolumeDetailVO;
     import com.cloud.storage.VolumeVO;
     import com.cloud.storage.dao.DiskOfferingDao;
     import com.cloud.storage.dao.SnapshotDao;
     import com.cloud.storage.dao.SnapshotDetailsDao;
     import com.cloud.storage.dao.SnapshotDetailsVO;
     import com.cloud.storage.dao.VolumeDao;
    +import com.cloud.storage.dao.VolumeDetailsDao;
     import com.cloud.utils.NumbersUtil;
     import com.cloud.utils.exception.CloudRuntimeException;
     import com.cloud.vm.VirtualMachineManager;
     
    +import com.google.common.base.Preconditions;
    +
     @Component
     public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
         private static final Logger s_logger = Logger.getLogger(StorageSystemDataMotionStrategy.class);
    +    private static final Random random = new Random(System.nanoTime());
     
         @Inject private AgentManager _agentMgr;
         @Inject private ConfigurationDao _configDao;
    +    @Inject private DataStoreManager dataStoreMgr;
         @Inject private DiskOfferingDao _diskOfferingDao;
    +    @Inject private ClusterDao clusterDao;
         @Inject private HostDao _hostDao;
    +    @Inject private HostDetailsDao hostDetailsDao;
         @Inject private ManagementService _mgr;
         @Inject private PrimaryDataStoreDao _storagePoolDao;
         @Inject private SnapshotDao _snapshotDao;
         @Inject private SnapshotDetailsDao _snapshotDetailsDao;
         @Inject private VolumeDao _volumeDao;
         @Inject private VolumeDataFactory _volumeDataFactory;
    +    @Inject private VolumeDetailsDao volumeDetailsDao;
         @Inject private VolumeService _volumeService;
     
         @Override
         public StrategyPriority canHandle(DataObject srcData, DataObject destData) {
             if (srcData instanceof SnapshotInfo) {
    -            if (canHandle(srcData.getDataStore()) || canHandle(destData.getDataStore()))
{
    +            if (canHandle(srcData) || canHandle(destData)) {
                     return StrategyPriority.HIGHEST;
                 }
             }
     
    +        if (srcData instanceof TemplateInfo && destData instanceof VolumeInfo
&&
    +                (srcData.getDataStore().getId() == destData.getDataStore().getId()) &&
    +                (canHandle(srcData) || canHandle(destData))) {
    +            // Both source and dest are on the same storage, so just clone them.
    +            return StrategyPriority.HIGHEST;
    +        }
    +
             return StrategyPriority.CANT_HANDLE;
         }
     
    -    private boolean canHandle(DataStore dataStore) {
    +    private boolean canHandle(DataObject dataObject) {
    +        Preconditions.checkArgument(dataObject != null, "Passing 'null' to dataObject
of canHandle(DataObject) is not supported.");
    +
    +        DataStore dataStore = dataObject.getDataStore();
    +
             if (dataStore.getRole() == DataStoreRole.Primary) {
                 Map<String, String> mapCapabilities = dataStore.getDriver().getCapabilities();
     
    -            if (mapCapabilities != null) {
    +            if (mapCapabilities == null) {
    +                return false;
    +            }
    +
    +            if (dataObject instanceof VolumeInfo || dataObject instanceof  SnapshotInfo)
{
                     String value = mapCapabilities.get(DataStoreCapabilities.STORAGE_SYSTEM_SNAPSHOT.toString());
    -                Boolean supportsStorageSystemSnapshots = new Boolean(value);
    +                Boolean supportsStorageSystemSnapshots = Boolean.valueOf(value);
     
                     if (supportsStorageSystemSnapshots) {
                         s_logger.info("Using 'StorageSystemDataMotionStrategy'");
     
                         return true;
                     }
    +            } else if (dataObject instanceof TemplateInfo) {
    +                // If the storage system can clone volumes, we can cache templates on
it.
    +                String value = mapCapabilities.get(DataStoreCapabilities.CAN_CREATE_VOLUME_FROM_VOLUME.toString());
    +                Boolean canCloneVolume = Boolean.valueOf(value);
    +
    +                if (canCloneVolume) {
    +                    s_logger.info("Using 'StorageSystemDataMotionStrategy'");
    --- End diff --
    
    Done


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message