You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/04 11:38:34 UTC
[1/2] git commit: updated refs/heads/master to 2fd6fac
Repository: cloudstack
Updated Branches:
refs/heads/master 6f2e6a7fa -> 2fd6fac21
CLOUDSTACK-89027 Restart Network fails in EIP/ELB zone
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3c61746d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3c61746d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3c61746d
Branch: refs/heads/master
Commit: 3c61746dcec5025d10fda0f85c9157f69f58b15d
Parents: a601ae4
Author: Bharat Kumar <bh...@citrix.com>
Authored: Wed Sep 23 14:05:38 2015 +0530
Committer: Bharat Kumar <bh...@citrix.com>
Committed: Wed Sep 23 16:19:37 2015 +0530
----------------------------------------------------------------------
.../com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c61746d/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
index d7ee2b6..75267c7 100644
--- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
+++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
@@ -1009,7 +1009,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
}
// Send a command to the external load balancer to implement or shutdown the guest network
- long guestVlanTag = Long.parseLong(BroadcastDomainType.getValue(guestConfig.getBroadcastUri()));
+ String guestVlanTag = BroadcastDomainType.getValue(guestConfig.getBroadcastUri());
String selfIp = null;
String guestVlanNetmask = NetUtils.cidr2Netmask(guestConfig.getCidr());
Integer networkRate = _networkModel.getNetworkRate(guestConfig.getId(), null);
@@ -1042,7 +1042,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
// It's a hack, using isOneToOneNat field for indicate if it's inline or not
boolean inline = _networkMgr.isNetworkInlineMode(guestConfig);
IpAddressTO ip =
- new IpAddressTO(guestConfig.getAccountId(), null, add, false, true, String.valueOf(guestVlanTag), selfIp, guestVlanNetmask, null, networkRate, inline);
+ new IpAddressTO(guestConfig.getAccountId(), null, add, false, true, guestVlanTag, selfIp, guestVlanNetmask, null, networkRate, inline);
IpAddressTO[] ips = new IpAddressTO[1];
ips[0] = ip;
IpAssocCommand cmd = new IpAssocCommand(ips);
[2/2] git commit: updated refs/heads/master to 2fd6fac
Posted by re...@apache.org.
Merge pull request #898 from bvbharatk/CLOUDSTACK-8902
CLOUDSTACK-8902 Restart Network fails in EIP/ELB zoneThe restart network was failing when using external loadbalencer. The failure was because of a number format exception. When BroadcastDomainType.getValue(guestConfig.getBroadcastUri() is executed this returns a string untagged. We were trying to parse this as long so there was a number pointer exception.
This happens only when the vlan uri is vlan://untagged. in other cases were there is a number instead of untagged (vlan tag) this used to succeed. Although we were trying to convert the number to long we were not really using it. we were converting the number to long and then back to string when creating the IpAddressTo. so I removed this unnecessary conversion in this case for fixing the issue at hand.
I did a manual restart of the network and checked for this number format exception in a EIP/ELB setup.
* pr/898:
CLOUDSTACK-89027 Restart Network fails in EIP/ELB zone
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2fd6fac2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2fd6fac2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2fd6fac2
Branch: refs/heads/master
Commit: 2fd6fac214956693b43dd3e75b6d8a4bc4e9fdc6
Parents: 6f2e6a7 3c61746
Author: Remi Bergsma <gi...@remi.nl>
Authored: Wed Nov 4 11:37:51 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Wed Nov 4 11:37:51 2015 +0100
----------------------------------------------------------------------
.../com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------