create volume command needs to send to vmwareresource

sudison · sudison · commit 36146e7f65e6 · 2013-05-10T19:26:44.000-07:00
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -42,6 +42,9 @@
 import com.cloud.agent.api.storage.CreateVolumeOVACommand;
 import com.cloud.agent.api.storage.PrepareOVAPackingCommand;
 import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
+import com.cloud.agent.api.to.DataObjectType;
+import com.cloud.agent.api.to.DataStoreTO;
+import com.cloud.agent.api.to.DataTO;
 import com.cloud.agent.api.to.NicTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
 import com.cloud.cluster.ClusterManager;
@@ -64,6 +67,7 @@
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.secstorage.CommandExecLogDao;
 import com.cloud.secstorage.CommandExecLogVO;
+import com.cloud.storage.DataStoreRole;
 import com.cloud.storage.GuestOSVO;
 import com.cloud.storage.dao.GuestOSDao;
 import com.cloud.storage.secondary.SecondaryStorageVmManager;
@@ -289,7 +293,23 @@ public long getCommandHostDelegation(long hostId, Command cmd) {
                 cmd instanceof PrepareOVAPackingCommand ||
                 cmd instanceof CreateVolumeFromSnapshotCommand ||
                 cmd instanceof CopyCommand) {
-            needDelegation = true;
+            if (cmd instanceof CopyCommand) {
+                CopyCommand cpyCommand = (CopyCommand)cmd;
+                DataTO srcData = cpyCommand.getSrcTO();
+                DataStoreTO srcStoreTO = srcData.getDataStore();
+                DataTO destData = cpyCommand.getDestTO();
+                DataStoreTO destStoreTO = destData.getDataStore();
+                
+                if (destData.getObjectType() == DataObjectType.VOLUME && destStoreTO.getRole() == DataStoreRole.Primary &&
+                        srcData.getObjectType() == DataObjectType.TEMPLATE && srcStoreTO.getRole() == DataStoreRole.Primary) {
+                    needDelegation = false;
+                } else {
+                    needDelegation = true;
+                }
+            } else {
+                needDelegation = true;
+            }
+            
         }
         /* Fang: remove this before checking in */
         // needDelegation = false;
diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java
@@ -321,7 +321,7 @@ public void run() {
 					GetStorageStatsCommand command = new GetStorageStatsCommand(pool.getUuid(), pool.getPoolType(), pool.getPath());
 					long poolId = pool.getId();
 					try {
-    					Answer answer = _storageManager.sendToPool(pool.getId(), command);
+    					Answer answer = _storageManager.sendToPool(pool, command);
     					if (answer != null && answer.getResult()) {
     						storagePoolStats.put(pool.getId(), (StorageStats)answer);
 
