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/07/31 01:17:30 UTC
[1/3] git commit: updated refs/heads/master to 7774ecf
Updated Branches:
refs/heads/master 1e1ee902a -> 7774ecfd5
CLOUDSTACK-3944: fix regression for vmware
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c42f51d7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c42f51d7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c42f51d7
Branch: refs/heads/master
Commit: c42f51d75b0fa237c69b4b4228dc1f82347e255a
Parents: 1e1ee90
Author: Edison Su <su...@gmail.com>
Authored: Tue Jul 30 11:34:19 2013 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Tue Jul 30 16:17:02 2013 -0700
----------------------------------------------------------------------
.../com/cloud/hypervisor/guru/VMwareGuru.java | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c42f51d7/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 7d0c12a..95152fc 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -300,11 +300,6 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru {
public Pair<Boolean, Long> getCommandHostDelegation(long hostId, Command cmd) {
boolean needDelegation = false;
- HostVO host = _hostDao.findById(hostId);
- if (host.getHypervisorType() != HypervisorType.VMware) {
- return new Pair<Boolean, Long>(Boolean.FALSE, new Long(hostId));
- }
-
if (cmd instanceof CopyCommand) {
CopyCommand cpyCommand = (CopyCommand)cmd;
DataTO srcData = cpyCommand.getSrcTO();
@@ -312,12 +307,6 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru {
DataTO destData = cpyCommand.getDestTO();
DataStoreTO destStoreTO = destData.getDataStore();
- if ((HypervisorType.VMware == srcData.getHypervisorType() ||
- HypervisorType.VMware == destData.getHypervisorType()
- )) {
- needDelegation = true;
- }
-
if (srcData.getObjectType() == DataObjectType.VOLUME) {
VolumeObjectTO volumeObjectTO = (VolumeObjectTO)srcData;
if (Storage.ImageFormat.OVA == volumeObjectTO.getFormat()) {
@@ -325,6 +314,12 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru {
}
}
+ if (!needDelegation && !(HypervisorType.VMware == srcData.getHypervisorType() ||
+ HypervisorType.VMware == destData.getHypervisorType()
+ )) {
+ return new Pair<Boolean, Long>(Boolean.FALSE, new Long(hostId));
+ }
+
if (destData.getObjectType() == DataObjectType.VOLUME && destStoreTO.getRole() == DataStoreRole.Primary &&
srcData.getObjectType() == DataObjectType.TEMPLATE && srcStoreTO.getRole() == DataStoreRole.Primary) {
needDelegation = false;
@@ -347,7 +342,7 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru {
if(!needDelegation) {
return new Pair<Boolean, Long>(Boolean.FALSE, new Long(hostId));
}
-
+ HostVO host = _hostDao.findById(hostId);
long dcId = host.getDataCenterId();
Pair<HostVO, SecondaryStorageVmVO> cmdTarget = _secStorageMgr.assignSecStorageVm(dcId, cmd);
if(cmdTarget != null) {
[3/3] git commit: updated refs/heads/master to 7774ecf
Posted by ed...@apache.org.
CLOUDSTACK-3959: [KVM] agent setup failed when physical interface name is in pXpY format
Add handling.
Signed-off-by: Edison Su <su...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7774ecfd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7774ecfd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7774ecfd
Branch: refs/heads/master
Commit: 7774ecfd5ab3e2ecf1fc75634a959737a302dc79
Parents: 211524f
Author: Toshiaki Hatano <to...@verio.net>
Authored: Tue Jul 30 22:03:32 2013 +0000
Committer: Edison Su <su...@gmail.com>
Committed: Tue Jul 30 16:17:12 2013 -0700
----------------------------------------------------------------------
.../hypervisor/kvm/resource/LibvirtComputingResource.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7774ecfd/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index bfa0b7e..d91c1c5 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1000,7 +1000,7 @@ ServerResource {
File f = new File("/sys/devices/virtual/net/" + bridgeName + "/brif");
if (! f.isDirectory()){
- s_logger.debug("failing to get physical interface from bridge"
+ s_logger.debug("failing to get physical interface from bridge "
+ bridgeName + ", does " + f.getAbsolutePath()
+ "exist?");
return "";
@@ -1012,13 +1012,14 @@ ServerResource {
String fname = interfaces[i].getName();
s_logger.debug("matchPifFileInDirectory: file name '"+fname+"'");
if (fname.startsWith("eth") || fname.startsWith("bond")
- || fname.startsWith("vlan") || fname.startsWith("em")) {
+ || fname.startsWith("vlan") || fname.startsWith("em")
+ || fname.matches("^p\\d+p\\d+")) {
return fname;
}
}
- s_logger.debug("failing to get physical interface from bridge"
- + bridgeName + ", did not find an eth*, bond*, or vlan* in "
+ s_logger.debug("failing to get physical interface from bridge "
+ + bridgeName + ", did not find an eth*, bond*, vlan*, em*, or p*p* in "
+ f.getAbsolutePath());
return "";
}
[2/3] git commit: updated refs/heads/master to 7774ecf
Posted by ed...@apache.org.
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/211524f3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/211524f3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/211524f3
Branch: refs/heads/master
Commit: 211524f3bcd304852b57f1b248163b26527d4fd4
Parents: c42f51d
Author: Edison Su <su...@gmail.com>
Authored: Tue Jul 30 11:37:05 2013 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Tue Jul 30 16:17:06 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/211524f3/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 95152fc..d699a1e 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();