You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2012/08/24 16:03:37 UTC

[2/2] git commit: Only use the PremiumSecondaryStorageResource if VmWare is the hypervisor

Only use the PremiumSecondaryStorageResource if VmWare is the hypervisor

Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e3f2cf90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e3f2cf90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e3f2cf90

Branch: refs/heads/master
Commit: e3f2cf908a32e1ea2a0415474bf708112f52099c
Parents: d051060
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Aug 24 15:57:18 2012 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Aug 24 15:57:18 2012 +0200

----------------------------------------------------------------------
 .../secondary/SecondaryStorageManagerImpl.java     |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e3f2cf90/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
index 8662000..7a94001 100755
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
@@ -1064,9 +1064,14 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V
 
         if (_configDao.isPremium()) {
             if (profile.getHypervisorType() == HypervisorType.Hyperv) {
+            	s_logger.debug("Hyperv hypervisor configured, telling the ssvm to load the CifsSecondaryStorageResource");
                 buf.append(" resource=com.cloud.storage.resource.CifsSecondaryStorageResource");
+            } else if (profile.getHypervisorType() == HypervisorType.VMware) {
+            	s_logger.debug("VmWare hypervisor configured, telling the ssvm to load the PremiumSecondaryStorageResource");
+            	buf.append(" resource=com.cloud.storage.resource.PremiumSecondaryStorageResource");
             } else {
-                buf.append(" resource=com.cloud.storage.resource.PremiumSecondaryStorageResource");
+            	s_logger.debug("Telling the ssvm to load the NfsSecondaryStorageResource");
+                buf.append(" resource=com.cloud.storage.resource.NfsSecondaryStorageResource");
             }
         } else {
             buf.append(" resource=com.cloud.storage.resource.NfsSecondaryStorageResource");