lovejavaee
diff --git a/‎api/src/com/cloud/agent/api/to/VolumeTO.java‎
Lines changed: 4 additions & 0 deletions b/‎api/src/com/cloud/agent/api/to/VolumeTO.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java‎
Lines changed: 2 additions & 0 deletions b/‎engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java‎
Lines changed: 18 additions & 0 deletions b/‎engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java‎
Lines changed: 18 additions & 0 deletions b/‎engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java‎
Lines changed: 18 additions & 0 deletions
@@ -126,6 +126,10 @@ public String getPoolUuid() {
     public String getChainInfo() {
         return chainInfo;
     }
+    
+    public void setChainInfo(String chainInfo) {
+    	this.chainInfo = chainInfo;
+    }
 
     public String getOsType() {
         return guestOsType;
 
@@ -92,4 +92,6 @@ public interface VolumeOrchestrationService {
     boolean validateVolumeSizeRange(long size);
 
     StoragePool findStoragePool(DiskProfile dskCh, DataCenter dc, Pod pod, Long clusterId, Long hostId, VirtualMachine vm, Set<StoragePool> avoid);
+
+    void updateVolumeDiskChain(long volumeId, String path, String chainInfo);
 }
@@ -46,6 +46,8 @@
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.log4j.Logger;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.Listener;
@@ -76,8 +78,10 @@
 import com.cloud.agent.api.StopCommand;
 import com.cloud.agent.api.UnPlugNicAnswer;
 import com.cloud.agent.api.UnPlugNicCommand;
+import com.cloud.agent.api.to.DiskTO;
 import com.cloud.agent.api.to.NicTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.agent.api.to.VolumeTO;
 import com.cloud.agent.manager.Commands;
 import com.cloud.agent.manager.allocator.HostAllocator;
 import com.cloud.alert.AlertManager;
@@ -902,6 +906,8 @@ else if (_uservmDetailsDao.findDetail(vm.getId(),"cpuOvercommitRatio") != null)
                             destHostId = finalHost.getId();
                         }
                         if (vmGuru.finalizeStart(vmProfile, destHostId, cmds, ctx)) {
+                            syncDiskChainChange(startAnswer);
+                            
                             if (!changeState(vm, Event.OperationSucceeded, destHostId, work, Step.Done)) {
                                 throw new ConcurrentOperationException("Unable to transition to a new state.");
                             }
@@ -992,6 +998,18 @@ else if (_uservmDetailsDao.findDetail(vm.getId(),"cpuOvercommitRatio") != null)
                     + "' (" + vm.getUuid() + "), see management server log for details");
         }
     }
+    
+    private void syncDiskChainChange(StartAnswer answer) {
+    	VirtualMachineTO vmSpec = answer.getVirtualMachine();
+    	
+    	for(DiskTO disk : vmSpec.getDisks()) {
+    		if(disk.getType() != Volume.Type.ISO) {
+	    		VolumeObjectTO vol = (VolumeObjectTO)disk.getData();
+	    		
+	    		volumeMgr.updateVolumeDiskChain(vol.getId(), vol.getPath(), vol.getChainInfo());
+    		}
+    	}
+    }
 
     @Override
     public void stop(String vmUuid) throws ResourceUnavailableException {
 
@@ -1127,4 +1127,22 @@ public String getStoragePoolOfVolume(long volumeId) {
         VolumeVO vol = _volsDao.findById(volumeId);
         return dataStoreMgr.getPrimaryDataStore(vol.getPoolId()).getUuid();
     }
+    
+    public void updateVolumeDiskChain(long volumeId, String path, String chainInfo) {
+        VolumeVO vol = _volsDao.findById(volumeId);
+        boolean needUpdate = false;
+        if(!vol.getPath().equalsIgnoreCase(path))
+        	needUpdate = true;
+        
+        if(chainInfo != null && (vol.getChainInfo() == null || !chainInfo.equalsIgnoreCase(vol.getChainInfo())))
+        	needUpdate = true;
+        
+        if(needUpdate) {
+        	s_logger.info("Update volume disk chain info. vol: " + vol.getId() + ", " + vol.getPath() + " -> " + path 
+        		+ ", " + vol.getChainInfo() + " -> " + chainInfo);
+	        vol.setPath(path);
+	        vol.setChainInfo(chainInfo);
+	        _volsDao.update(volumeId, vol);
+        }
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -92,4 +92,6 @@ public interface VolumeOrchestrationService {`
`92`	`92`	`boolean validateVolumeSizeRange(long size);`
`93`	`93`
`94`	`94`	`StoragePool findStoragePool(DiskProfile dskCh, DataCenter dc, Pod pod, Long clusterId, Long hostId, VirtualMachine vm, Set<StoragePool> avoid);`
	`95`	`+`
	`96`	`+ void updateVolumeDiskChain(long volumeId, String path, String chainInfo);`
`95`	`97`	`}`