You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/06/21 01:53:46 UTC
git commit: updated refs/heads/master-6-17-stable to b9d4dd0
Updated Branches:
refs/heads/master-6-17-stable 08cee8b38 -> b9d4dd0ff
CLOUDSTACK-2947: fix create template from snapshot, in case of mix zone-wide/cluster wide primary storage
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b9d4dd0f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b9d4dd0f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b9d4dd0f
Branch: refs/heads/master-6-17-stable
Commit: b9d4dd0ffa389b2aef23b97985a1289f19342ae7
Parents: 08cee8b
Author: Edison Su <su...@gmail.com>
Authored: Thu Jun 20 16:53:15 2013 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Jun 20 16:53:30 2013 -0700
----------------------------------------------------------------------
client/tomcatconf/log4j-cloud.xml.in | 4 ++++
server/src/com/cloud/storage/StorageManagerImpl.java | 12 +++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9d4dd0f/client/tomcatconf/log4j-cloud.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/log4j-cloud.xml.in b/client/tomcatconf/log4j-cloud.xml.in
index 0e7f004..a021982 100755
--- a/client/tomcatconf/log4j-cloud.xml.in
+++ b/client/tomcatconf/log4j-cloud.xml.in
@@ -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>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9d4dd0f/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 655eaea..1b5fcc5 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -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);