Improve ip manger performance

services/private_ip_manager/src/main/java/com/futurewei/alcor/privateipmanager/repo/IpAddrRangeRepo.java

@@ -155,24 +155,30 @@ private IpAddrAlloc doAllocateIpAddr(String vpcId, int ipVersion, String ipAddr)
             if (ipAddrAlloc != null) {
                 break;
             }
-
-            IpAddrRange ipAddrRange = ipAddrRangeCache.get(rangeId);
-            if (ipAddrRange == null) {
-                throw new IpRangeNotFoundException();
-            }
-
-            if (ipAddrRange.getIpVersion() != ipVersion) {
-                continue;
+            synchronized (this) {
+                try (Transaction tx = ipAddrRangeCache.getTransaction().start()) {
+                    IpAddrRange ipAddrRange = ipAddrRangeCache.get(rangeId);
+                    if (ipAddrRange == null) {
+                        throw new IpRangeNotFoundException();
+                    }
+
+                    if (ipAddrRange.getIpVersion() != ipVersion) {
+                        continue;
+                    }
+
+                    try {
+                        ipAddrAlloc = ipAddrRange.allocate(ipAddr);
+                    } catch (Exception e) {
+                        LOG.warn("Allocate ip address from {} failed", ipAddrRange.getId());
+                        continue;
+                    }
+
+                    ipAddrRangeCache.put(ipAddrRange.getId(), ipAddrRange);
+                    tx.commit();
+                }
             }
 
-            try {
-                ipAddrAlloc = ipAddrRange.allocate(ipAddr);
-            } catch (Exception e) {
-                LOG.warn("Allocate ip address from {} failed", ipAddrRange.getId());
-                continue;
-            }
 
-            ipAddrRangeCache.put(ipAddrRange.getId(), ipAddrRange);
             break;
         }
 
@@ -190,17 +196,9 @@ private IpAddrAlloc doAllocateIpAddr(String vpcId, int ipVersion, String ipAddr)
      * @throws Exception Db operation or ip address assignment exception
      */
     @DurationStatistics
-    public synchronized IpAddrAlloc allocateIpAddr(IpAddrRequest request) throws Exception {
-        IpAddrAlloc ipAddrAlloc = null;
-        try (Transaction tx = ipAddrRangeCache.getTransaction().start()) {
-            ipAddrAlloc = allocateIpAddrMethod(request);
-            tx.commit();
+    public IpAddrAlloc allocateIpAddr(IpAddrRequest request) throws Exception {
+            IpAddrAlloc ipAddrAlloc = allocateIpAddrMethod(request);
             return ipAddrAlloc;
-        } catch (Exception e) {
-            LOG.warn("Transaction exception: ");
-            LOG.warn(e.getMessage());
-        }
-        return ipAddrAlloc;
     }
 
     /**
@@ -520,18 +518,26 @@ private void allocateIpAddrBulkMethod(Map<String, List<IpAddrRequest>> rangeRequ
 
     }
 
+    @DurationStatistics
     private IpAddrAlloc allocateIpAddrMethod(IpAddrRequest request) throws Exception {
         IpAddrAlloc ipAddrAlloc;
         if (request.getRangeId() == null) {
             ipAddrAlloc = doAllocateIpAddr(request.getVpcId(), request.getIpVersion(), request.getIp());
         } else {
-            IpAddrRange ipAddrRange = ipAddrRangeCache.get(request.getRangeId());
-            if (ipAddrRange == null) {
-                throw new IpRangeNotFoundException();
+            synchronized (this) {
+                try (Transaction tx = ipAddrRangeCache.getTransaction().start()) {
+                    IpAddrRange ipAddrRange = ipAddrRangeCache.get(request.getRangeId());
+                    if (ipAddrRange == null) {
+                        throw new IpRangeNotFoundException();
+                    }
+
+                    ipAddrAlloc = ipAddrRange.allocate(request.getIp());
+                    ipAddrRangeCache.put(ipAddrRange.getId(), ipAddrRange);
+                    tx.commit();
+                }
             }
 
-            ipAddrAlloc = ipAddrRange.allocate(request.getIp());
-            ipAddrRangeCache.put(ipAddrRange.getId(), ipAddrRange);
+
         }
         return ipAddrAlloc;
     }

services/subnet_manager/src/main/java/com/futurewei/alcor/subnet/controller/SubnetController.java

@@ -426,11 +426,11 @@ public SubnetWebJson updateSubnetState(@PathVariable String projectId, @PathVari
             }
 
             // update subnet routing rule in route manager
+
             if (hostRoutes != null && hostRoutes.size() > 0) {
                 this.subnetService.updateSubnetRoutingRuleInRM(projectId, subnetId, subnetEntity);
             }
 
-
             this.subnetDatabaseService.addSubnet(subnetEntity);
             subnetEntity = this.subnetDatabaseService.getBySubnetId(subnetId);
 

web/src/main/java/com/futurewei/alcor/web/restclient/IpManagerRestClient.java

@@ -24,6 +24,7 @@ free of charge, to any person obtaining a copy of this software and associated d
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
+import org.springframework.retry.annotation.Retryable;
 
 import java.util.List;
 
@@ -82,6 +83,7 @@ public IpAddrRequest allocateIpAddress(IpVersion ipVersion, String vpcId, String
     }
 
     @DurationStatistics
+    @Retryable
     public IpAddrRequest allocateIpAddress(IpAddrRequest ipAddrRequest) throws Exception {
         HttpEntity<IpAddrRequest> request = new HttpEntity<>(ipAddrRequest);
         IpAddrRequest result = restTemplate.postForObject(ipManagerUrl, request, IpAddrRequest.class);