Updated Branches: refs/heads/4.2 d9ba83f0a -> b3576cac2
add note on vmwarweguru->getCommandHostDelegation Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b3576cac Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b3576cac Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b3576cac Branch: refs/heads/4.2 Commit: b3576cac27e1d9f91f6d8fad8044c4b36ad9a4cd Parents: d9ba83f Author: Edison Su <[email protected]> Authored: Tue Jul 30 11:37:05 2013 -0700 Committer: Edison Su <[email protected]> Committed: Tue Jul 30 11:37:14 2013 -0700 ---------------------------------------------------------------------- .../vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3576cac/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java index 2373d09..292f7e9 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java @@ -300,6 +300,8 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru { public Pair<Boolean, Long> getCommandHostDelegation(long hostId, Command cmd) { boolean needDelegation = false; + //NOTE: the hostid can be a hypervisor host, or a ssvm agent. For copycommand, if it's for volume upload, the hypervisor + //type is empty, so we need to check the format of volume at first. if (cmd instanceof CopyCommand) { CopyCommand cpyCommand = (CopyCommand)cmd; DataTO srcData = cpyCommand.getSrcTO();
