From 3cced927c4b1d7e1d8f19bccef46ed8d82e31f41 Mon Sep 17 00:00:00 2001 From: Sudhansu Date: Fri, 18 Dec 2015 09:57:08 +0530 Subject: [PATCH] CLOUDSTACK-9842: Unable to map root volume usage to VM removed code which nullifies vm_instance_id Also modified QueryManagerImpl to ignore volume which does not have uuid. This is to avoid duplicate volume listing. --- engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java | 1 - server/src/com/cloud/api/query/QueryManagerImpl.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java index 4f5b613ddd1..68eb03cf124 100644 --- a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java @@ -647,7 +647,6 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol String uuid = srcVol.getUuid(); Long instanceId = srcVol.getInstanceId(); srcVol.setUuid(null); - srcVol.setInstanceId(null); destVol.setUuid(uuid); destVol.setInstanceId(instanceId); update(srcVolId, srcVol); diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index ce667c028d3..be165bae813 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -1769,6 +1769,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ); sb.and("idIN", sb.entity().getId(), SearchCriteria.Op.IN); sb.and("volumeType", sb.entity().getVolumeType(), SearchCriteria.Op.LIKE); + sb.and("uuid", sb.entity().getUuid(), SearchCriteria.Op.NNULL); sb.and("instanceId", sb.entity().getVmId(), SearchCriteria.Op.EQ); sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ); sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ);