From 42b89278e9386b8bc90e36fb600d7730e676ae72 Mon Sep 17 00:00:00 2001
From: Anshul Gangwar <anshul.gangwar@citrix.com>
Date: Wed, 10 Jun 2015 15:33:42 +0530
Subject: [PATCH] CLOUDSTACK-8833: Fixed  Generating url and migrate volume to
 another storage , resulting two entry in UI and listvolume is not working for
 that volume Update the volume id in volume_store_ref table to newly created
 volume for migration

---
 .../datastore/db/VolumeDataStoreDao.java        |  2 ++
 .../image/db/VolumeDataStoreDaoImpl.java        | 17 +++++++++++++++++
 .../storage/volume/VolumeServiceImpl.java       |  1 +
 3 files changed, 20 insertions(+)

diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java
index e65880d316c..fb9844116c1 100644
--- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java
+++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java
@@ -51,4 +51,6 @@ public interface VolumeDataStoreDao extends GenericDao<VolumeDataStoreVO, Long>,
     List<VolumeDataStoreVO> listUploadedVolumesByStoreId(long id);
 
     List<VolumeDataStoreVO> listByVolumeState(Volume.State... states);
+
+    boolean updateVolumeId(long srcVolId, long destVolId);
 }
diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
index d01ec411d06..8258042984d 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
@@ -25,6 +25,7 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore;
@@ -350,4 +351,20 @@ public class VolumeDataStoreDaoImpl extends GenericDaoBase<VolumeDataStoreVO, Lo
         return listIncludingRemovedBy(sc);
     }
 
+    @Override
+    public boolean updateVolumeId(long srcVolId, long destVolId) {
+        TransactionLegacy txn = TransactionLegacy.currentTxn();
+        try {
+            VolumeDataStoreVO volumeDataStoreVO = findByVolume(srcVolId);
+            if(volumeDataStoreVO != null) {
+                txn.start();
+                volumeDataStoreVO.setVolumeId(destVolId);
+                update(volumeDataStoreVO.getId(), volumeDataStoreVO);
+                txn.commit();
+            }
+        } catch (Exception e) {
+            throw new CloudRuntimeException("Unable to update the volume id for volume store ref", e);
+        }
+        return true;
+    }
 }
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 2e72286b222..a11d770c265 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -1428,6 +1428,7 @@ public class VolumeServiceImpl implements VolumeService {
             srcVolume.processEvent(Event.OperationSuccessed);
             destVolume.processEvent(Event.MigrationCopySucceeded, result.getAnswer());
             volDao.updateUuid(srcVolume.getId(), destVolume.getId());
+            _volumeStoreDao.updateVolumeId(srcVolume.getId(), destVolume.getId());
             try {
                 destroyVolume(srcVolume.getId());
                 srcVolume = volFactory.getVolume(srcVolume.getId());