CLOUDSTACK-2160: fix bug add a huge size guest network will cause out of memory

Hongtu Zang · Mice Xia · commit f1c794de1bb9 · 2013-05-02T13:19:12.000+08:00
Signed-off-by: Mice Xia &lt;mice_xia@tcloudcomputing.com&gt;
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1666,20 +1666,17 @@ public Set<Long> getAvailableIps(Network network, String requestedIp) {
         List<String> ips = _nicDao.listIpAddressInNetwork(network.getId());
         List<String> secondaryIps = _nicSecondaryIpDao.listSecondaryIpAddressInNetwork(network.getId());
         ips.addAll(secondaryIps);
-        Set<Long> allPossibleIps = NetUtils.getAllIpsFromCidr(cidr[0], Integer.parseInt(cidr[1]));
         Set<Long> usedIps = new TreeSet<Long>(); 
-        
+
         for (String ip : ips) {
             if (requestedIp != null && requestedIp.equals(ip)) {
                 s_logger.warn("Requested ip address " + requestedIp + " is already in use in network" + network);
                 return null;
             }
-    
+
             usedIps.add(NetUtils.ip2Long(ip));
         }
-        if (usedIps.size() != 0) {
-            allPossibleIps.removeAll(usedIps);
-        }
+        Set<Long> allPossibleIps = NetUtils.getAllIpsFromCidr(cidr[0], Integer.parseInt(cidr[1]), usedIps);
 
         String gateway = network.getGateway();
         if ((gateway != null) && (allPossibleIps.contains(NetUtils.ip2Long(gateway))))
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2066,9 +2066,8 @@ public Network updateGuestNetwork(long networkId, String name, String displayTex
     protected Set<Long> getAvailableIps(Network network, String requestedIp) {
         String[] cidr = network.getCidr().split("/");
         List<String> ips = _nicDao.listIpAddressInNetwork(network.getId());
-        Set<Long> allPossibleIps = NetUtils.getAllIpsFromCidr(cidr[0], Integer.parseInt(cidr[1]));
         Set<Long> usedIps = new TreeSet<Long>(); 
-        
+
         for (String ip : ips) {
             if (requestedIp != null && requestedIp.equals(ip)) {
                 s_logger.warn("Requested ip address " + requestedIp + " is already in use in network" + network);
@@ -2077,9 +2076,7 @@ protected Set<Long> getAvailableIps(Network network, String requestedIp) {
 
             usedIps.add(NetUtils.ip2Long(ip));
         }
-        if (usedIps.size() != 0) {
-            allPossibleIps.removeAll(usedIps);
-        }
+        Set<Long> allPossibleIps = NetUtils.getAllIpsFromCidr(cidr[0], Integer.parseInt(cidr[1]), usedIps);
 
         String gateway = network.getGateway();
         if ((gateway != null) && (allPossibleIps.contains(NetUtils.ip2Long(gateway))))
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -627,7 +627,7 @@ public static String[] getIpRangeFromCidr(String cidr, long size) {
         return result;
     }
 
-    public static Set<Long> getAllIpsFromCidr(String cidr, long size) {
+    public static Set<Long> getAllIpsFromCidr(String cidr, long size, Set<Long> usedIps) {
         assert (size < 32) : "You do know this is not for ipv6 right?  Keep it smaller than 32 but you have " + size;
         Set<Long> result = new TreeSet<Long>();
         long ip = ip2Long(cidr);
@@ -639,8 +639,12 @@ public static Set<Long> getAllIpsFromCidr(String cidr, long size) {
 
         end++;
         end = (end << (32 - size)) - 2;
-        while (start <= end) {
-            result.add(start);
+        int maxIps = 255; // get 255 ips as maximum
+        while (start <= end && maxIps > 0) {
+            if (!usedIps.contains(start)){
+                result.add(start);
+                maxIps--;
+            }
             start++;
         }
 
