Merge remote-tracking branch 'origin/master' into FEATURE-CENIK123-v1…

….1 (reverted from commit 01c8ad8)
KarlHarrisSungardAS · Oct 15, 2014 · Oct 16, 2014 · Oct 15, 2014 · Oct 16, 2014 · Oct 16, 2014
commit 3b6cdc46e3f1df4e143507b1168a79dc28906314
diff --git a/api/src/com/cloud/agent/api/to/DiskTO.java b/api/src/com/cloud/agent/api/to/DiskTO.java
@@ -34,7 +34,6 @@ public class DiskTO {
     public static final String VOLUME_SIZE = "volumeSize";
     public static final String MOUNT_POINT = "mountpoint";
     public static final String PROTOCOL_TYPE = "protocoltype";
-    public static final String PATH = "path";
 
     private DataTO data;
     private Long diskSeq;

diff --git a/api/src/com/cloud/host/Status.java b/api/src/com/cloud/host/Status.java
@@ -123,7 +123,7 @@ public static String[] toStrings(Status... states) {
         s_fsm.addTransition(Status.Connecting, Event.Ready, Status.Up);
         s_fsm.addTransition(Status.Connecting, Event.PingTimeout, Status.Alert);
         s_fsm.addTransition(Status.Connecting, Event.ShutdownRequested, Status.Disconnected);
-        s_fsm.addTransition(Status.Connecting, Event.HostDown, Status.Down);
+        s_fsm.addTransition(Status.Connecting, Event.HostDown, Status.Alert);
         s_fsm.addTransition(Status.Connecting, Event.Ping, Status.Connecting);
         s_fsm.addTransition(Status.Connecting, Event.ManagementServerDown, Status.Disconnected);
         s_fsm.addTransition(Status.Connecting, Event.AgentDisconnected, Status.Alert);

diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java
@@ -38,6 +38,7 @@ enum State {
         Ready("The volume is ready to be used."),
         Migrating("The volume is migrating to other storage pool"),
         Snapshotting("There is a snapshot created on this volume, not backed up to secondary storage yet"),
+        Reverting("Replace the existing volume on a storage system with a snapshot of it"),
         Resizing("The volume is being resized"),
         Expunging("The volume is being expunging"),
         Expunged("The volume is being expunging"),
@@ -85,8 +86,11 @@ public String getDescription() {
             s_fsm.addTransition(Expunging, Event.OperationSucceeded, Expunged);
             s_fsm.addTransition(Expunging, Event.OperationFailed, Destroy);
             s_fsm.addTransition(Ready, Event.SnapshotRequested, Snapshotting);
+            s_fsm.addTransition(Ready, Event.RevertRequested, Reverting);
             s_fsm.addTransition(Snapshotting, Event.OperationSucceeded, Ready);
             s_fsm.addTransition(Snapshotting, Event.OperationFailed, Ready);
+            s_fsm.addTransition(Reverting, Event.OperationSucceeded, Ready);
+            s_fsm.addTransition(Reverting, Event.OperationFailed, Ready);
             s_fsm.addTransition(Ready, Event.MigrationRequested, Migrating);
             s_fsm.addTransition(Migrating, Event.OperationSucceeded, Ready);
             s_fsm.addTransition(Migrating, Event.OperationFailed, Ready);
@@ -111,6 +115,7 @@ enum Event {
         UploadRequested,
         MigrationRequested,
         SnapshotRequested,
+        RevertRequested,
         DestroyRequested,
         ExpungingRequested,
         ResizeRequested;

diff --git a/core/src/com/cloud/storage/resource/StorageProcessor.java b/core/src/com/cloud/storage/resource/StorageProcessor.java
@@ -26,7 +26,6 @@
 import org.apache.cloudstack.storage.command.DettachCommand;
 import org.apache.cloudstack.storage.command.ForgetObjectCmd;
 import org.apache.cloudstack.storage.command.IntroduceObjectCmd;
-import org.apache.cloudstack.storage.command.SnapshotAndCopyCommand;
 
 import com.cloud.agent.api.Answer;
 
@@ -63,9 +62,7 @@ public interface StorageProcessor {
 
     public Answer deleteSnapshot(DeleteCommand cmd);
 
-    public Answer introduceObject(IntroduceObjectCmd cmd);
+    Answer introduceObject(IntroduceObjectCmd cmd);
 
-    public Answer forgetObject(ForgetObjectCmd cmd);
-
-    public Answer snapshotAndCopy(SnapshotAndCopyCommand cmd);
+    Answer forgetObject(ForgetObjectCmd cmd);
 }
diff --git a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
@@ -28,7 +28,6 @@
 import org.apache.cloudstack.storage.command.DeleteCommand;
 import org.apache.cloudstack.storage.command.DettachCommand;
 import org.apache.cloudstack.storage.command.IntroduceObjectCmd;
-import org.apache.cloudstack.storage.command.SnapshotAndCopyCommand;
 import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
 
 import com.cloud.agent.api.Answer;
@@ -62,10 +61,7 @@ public Answer handleStorageCommands(StorageSubSystemCommand command) {
             return execute((DettachCommand)command);
         } else if (command instanceof IntroduceObjectCmd) {
             return processor.introduceObject((IntroduceObjectCmd)command);
-        } else if (command instanceof SnapshotAndCopyCommand) {
-            return processor.snapshotAndCopy((SnapshotAndCopyCommand)command);
         }
-
         return new Answer((Command)command, false, "not implemented yet");
     }
 

diff --git a/core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyAnswer.java b/core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyAnswer.java
diff --git a/core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java b/core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java
diff --git a/...pi/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java b/...pi/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
@@ -21,7 +21,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 
@@ -96,9 +95,9 @@ VolumeInfo moveVolume(VolumeInfo volume, long destPoolDcId, Long destPoolPodId,
 
     void cleanupVolumes(long vmId) throws ConcurrentOperationException;
 
-    void revokeAccess(DataObject dataObject, Host host, DataStore dataStore);
+    void disconnectVolumeFromHost(VolumeInfo volumeInfo, Host host, DataStore dataStore);
 
-    void revokeAccess(long vmId, long hostId);
+    void disconnectVolumesFromHost(long vmId, long hostId);
 
     void migrateVolumes(VirtualMachine vm, VirtualMachineTO vmTo, Host srcHost, Host destHost, Map<Volume, StoragePool> volumeToPool);
 

diff --git a/...ne/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java b/...ne/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
@@ -28,9 +28,9 @@
 public interface PrimaryDataStoreDriver extends DataStoreDriver {
     public ChapInfo getChapInfo(VolumeInfo volumeInfo);
 
-    public boolean grantAccess(DataObject dataObject, Host host, DataStore dataStore);
+    public boolean connectVolumeToHost(VolumeInfo volumeInfo, Host host, DataStore dataStore);
 
-    public void revokeAccess(DataObject dataObject, Host host, DataStore dataStore);
+    public void disconnectVolumeFromHost(VolumeInfo volumeInfo, Host host, DataStore dataStore);
 
     // intended for managed storage (cloud.storage_pool.managed = true)
     // if not managed, return volume.getSize()

diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java
@@ -44,9 +44,9 @@ public VolumeInfo getVolume() {
 
     ChapInfo getChapInfo(VolumeInfo volumeInfo, DataStore dataStore);
 
-    boolean grantAccess(DataObject dataObject, Host host, DataStore dataStore);
+    boolean connectVolumeToHost(VolumeInfo volumeInfo, Host host, DataStore dataStore);
 
-    void revokeAccess(DataObject dataObject, Host host, DataStore dataStore);
+    void disconnectVolumeFromHost(VolumeInfo volumeInfo, Host host, DataStore dataStore);
 
     /**
      * Creates the volume based on the given criteria

diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -775,7 +775,7 @@ protected boolean handleDisconnectWithoutInvestigation(AgentAttache attache, Sta
                 }
 
                 if (s_logger.isDebugEnabled()) {
-                    s_logger.debug("The next status of agent " + hostId + "is " + nextStatus + ", current status is " + currentStatus);
+                    s_logger.debug("The next status of agent " + hostId + " is " + nextStatus + ", current status is " + currentStatus);
                 }
             }
         }
@@ -825,10 +825,6 @@ protected boolean handleDisconnectWithInvestigation(AgentAttache attache, Status
 
                 if (determinedState == Status.Down) {
                     s_logger.error("Host is down: " + host.getId() + "-" + host.getName() + ".  Starting HA on the VMs");
-                    if ((host.getType() != Host.Type.SecondaryStorage) && (host.getType() != Host.Type.ConsoleProxy)) {
-                        _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "Host disconnected, " + host.getId(),
-                                "Host is down: " + host.getId() + "-" + host.getName() + ".  Starting HA on the VMs");
-                    }
                     event = Status.Event.HostDown;
                 } else if (determinedState == Status.Up) {
                     /* Got ping response from host, bring it back*/
@@ -861,18 +857,20 @@ protected boolean handleDisconnectWithInvestigation(AgentAttache attache, Status
                     HostPodVO podVO = _podDao.findById(host.getPodId());
                     String hostDesc = "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + podVO.getName();
                     _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "Host in ALERT state, " + hostDesc,
-                            "In availability zone " + host.getDataCenterId() + ", " + host.getId() + "-" + host.getName()
-                            + " disconnect due to event " + event + ", ms can't determine the host status" );
+                            "In availability zone " + host.getDataCenterId()
+                            + ", host is in alert state: " + host.getId() + "-" + host.getName());
                 }
             } else {
                 s_logger.debug("The next status of Agent " + host.getId() + " is not Alert, no need to investigate what happened");
             }
         }
+
         handleDisconnectWithoutInvestigation(attache, event, true, true);
         host = _hostDao.findById(hostId); // Maybe the host magically reappeared?
-        if (host != null && host.getStatus() == Status.Down) {
+        if (host != null && (host.getStatus() == Status.Alert || host.getStatus() == Status.Down)) {
             _haMgr.scheduleRestartForVmsOnHost(host, true);
         }
+
         return true;
     }
 
@@ -1515,7 +1513,7 @@ protected void runInContext() {
                                     || host.getType() == Host.Type.SecondaryStorageCmdExecutor)) {
 
                                 s_logger.warn("Disconnect agent for CPVM/SSVM due to physical connection close. host: " + host.getId());
-                                disconnectWithoutInvestigation(agentId, Event.ShutdownRequested);
+                                disconnectWithoutInvestigation(agentId, Event.PingTimeout);
                             } else {
                                 status_logger.debug("Ping timeout for host " + agentId + ", do invstigation");
                                 disconnectWithInvestigation(agentId, Event.PingTimeout);

diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -517,7 +517,7 @@ protected void advanceExpunge(VMInstanceVO vm) throws ResourceUnavailableExcepti
         }
 
         if (hostId != null) {
-            volumeMgr.revokeAccess(vm.getId(), hostId);
+            volumeMgr.disconnectVolumesFromHost(vm.getId(), hostId);
         }
 
         // Clean up volumes based on the vm's instance id

diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -34,7 +34,6 @@
 
 import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
 import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
@@ -872,29 +871,27 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
     }
 
     @Override
-    public void revokeAccess(DataObject dataObject, Host host, DataStore dataStore) {
+    public void disconnectVolumeFromHost(VolumeInfo volumeInfo, Host host, DataStore dataStore) {
         DataStoreDriver dataStoreDriver = dataStore != null ? dataStore.getDriver() : null;
 
         if (dataStoreDriver instanceof PrimaryDataStoreDriver) {
-            ((PrimaryDataStoreDriver)dataStoreDriver).revokeAccess(dataObject, host, dataStore);
+            ((PrimaryDataStoreDriver)dataStoreDriver).disconnectVolumeFromHost(volumeInfo, host, dataStore);
         }
     }
 
     @Override
-    public void revokeAccess(long vmId, long hostId) {
+    public void disconnectVolumesFromHost(long vmId, long hostId) {
         HostVO host = _hostDao.findById(hostId);
 
         List<VolumeVO> volumesForVm = _volsDao.findByInstance(vmId);
 
         if (volumesForVm != null) {
             for (VolumeVO volumeForVm : volumesForVm) {
                 VolumeInfo volumeInfo = volFactory.getVolume(volumeForVm.getId());
-
                 // pool id can be null for the VM's volumes in Allocated state
                 if (volumeForVm.getPoolId() != null) {
                     DataStore dataStore = dataStoreMgr.getDataStore(volumeForVm.getPoolId(), DataStoreRole.Primary);
-
-                    volService.revokeAccess(volumeInfo, host, dataStore);
+                    volService.disconnectVolumeFromHost(volumeInfo, host, dataStore);
                 }
             }
         }
@@ -1249,7 +1246,7 @@ private Pair<VolumeVO, DataStore> recreateVolume(VolumeVO vol, VirtualMachinePro
                     long hostId = vm.getVirtualMachine().getHostId();
                     Host host = _hostDao.findById(hostId);
 
-                    volService.grantAccess(volFactory.getVolume(newVol.getId()), host, destPool);
+                    volService.connectVolumeToHost(volFactory.getVolume(newVol.getId()), host, destPool);
                 }
 
                 newVol = _volsDao.findById(newVol.getId());