[cloudstack] branch 4.15 updated: storage: Secondary storage allow store deletion after successful data migration (#4615)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.15 by this push:
     new a896760  storage: Secondary storage allow store deletion after 
successful data migration (#4615)
a896760 is described below

commit a896760a40107d25b84baad5f547cf1da6c5c542
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Wed Feb 24 16:27:39 2021 +0530

    storage: Secondary storage allow store deletion after successful data 
migration (#4615)
    
    Co-authored-by: Pearl Dsilva <pearl.dsi...@shapeblue.com>
---
 server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java | 1 +
 .../src/main/java/com/cloud/template/HypervisorTemplateAdapter.java   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java 
b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
index add5645..c4a02a7 100644
--- a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
@@ -522,6 +522,7 @@ public class TemplateJoinDaoImpl extends 
GenericDaoBaseWithTagInformation<Templa
         sc.setParameters("store_id", storeId);
         sc.setParameters("type", TemplateType.USER);
         sc.setParameters("templateState", VirtualMachineTemplate.State.Active);
+        sc.setParameters("public", Boolean.FALSE);
         return searchIncludingRemoved(sc, null, null, false);
     }
 
diff --git 
a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java 
b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
index c080ffd..055d48f 100644
--- a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
+++ b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
@@ -247,7 +247,7 @@ public class HypervisorTemplateAdapter extends 
TemplateAdapterBase {
 
     private void createTemplateWithinZone(Long zId, TemplateProfile profile, 
VMTemplateVO template) {
         // find all eligible image stores for this zone scope
-        List<DataStore> imageStores = storeMgr.getImageStoresByScope(new 
ZoneScope(zId));
+        List<DataStore> imageStores = 
storeMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(zId));
         if (imageStores == null || imageStores.size() == 0) {
             throw new CloudRuntimeException("Unable to find image store to 
download template " + profile.getTemplate());
         }
@@ -314,7 +314,7 @@ public class HypervisorTemplateAdapter extends 
TemplateAdapterBase {
                     zoneId = profile.getZoneIdList().get(0);
 
                 // find all eligible image stores for this zone scope
-                List<DataStore> imageStores = 
storeMgr.getImageStoresByScope(new ZoneScope(zoneId));
+                List<DataStore> imageStores = 
storeMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(zoneId));
                 if (imageStores == null || imageStores.size() == 0) {
                     throw new CloudRuntimeException("Unable to find image 
store to download template " + profile.getTemplate());
                 }