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:15:39 UTC
git commit: updated refs/heads/4.2 to a310815
Updated Branches:
refs/heads/4.2 026cca46c -> a310815aa
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/a310815a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a310815a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a310815a
Branch: refs/heads/4.2
Commit: a310815aacd5c742caecc0e00cdec08182a38230
Parents: 026cca4
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:14:38 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/a310815a/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 571bcc8..56699af 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
@@ -1003,7 +1003,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 "";
@@ -1015,13 +1015,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 "";
}