etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #803 from anshul1886/CLOUDSTACK-8833 

CLOUDSTACK-8833: Fixed  Generating url and migrate volume to another storage , resulting two entry in UI and listvolume is not working for that volume
This commit is contained in:
Rajani Karuturi 2017-05-08 10:14:02 +05:30 committed by GitHub
parent 08c138de60 42b89278e9
commit 503c803ba0
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java
View File

@ -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);
}

17
engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
View File

@ -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;
}
}

1
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
View File

@ -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());