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

CLOUDSTACK-2947: fix create template from snapshot, in case of mix zone-wide/cluster wide primary storage

This commit is contained in:
Edison Su 2013-06-20 16:53:15 -07:00
parent 08cee8b38e
commit b9d4dd0ffa
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/tomcatconf/log4j-cloud.xml.in
View File

@ -123,6 +123,10 @@ under the License.
<priority value="DEBUG"/>
</category>
<category name="org.apache.cloudstack">
<priority value="DEBUG"/>
</category>
<category name="com.cloud.utils.nio">
<priority value="INFO"/>
</category>

12
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -399,9 +399,15 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
if (pool.getStatus() != StoragePoolStatus.Up) {
continue;
}
ClusterVO cluster = _clusterDao.findById(pool.getClusterId());
if (type == cluster.getHypervisorType()) {
retPools.add(pool);
if (pool.getScope() == ScopeType.ZONE) {
if (pool.getHypervisor() != null && pool.getHypervisor() == type) {
retPools.add(pool);
}
} else {
ClusterVO cluster = _clusterDao.findById(pool.getClusterId());
if (type == cluster.getHypervisorType()) {
retPools.add(pool);
}
}
}
Collections.shuffle(retPools);