NSX: Add retry logic with sleep to delete segments

Pearl1594 · Pearl1594 · commit 6f86193f336d · 2024-01-23T08:46:13.000-05:00
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
@@ -453,8 +453,9 @@ protected void removeSegment(String segmentName) {
         String siteId = getDefaultSiteId();
         String enforcementPointPath = getDefaultEnforcementPointPath(siteId);
         SegmentPorts segmentPortsService = (SegmentPorts) nsxService.apply(SegmentPorts.class);
-        PolicyGroupMembersListResult segmentPortsList = segmentPortsService.list(DEFAULT_DOMAIN, segmentName, null, enforcementPointPath,
-                false, null, 50L, false, null);
+        PolicyGroupMembersListResult segmentPortsList = getSegmentPortList(segmentPortsService, segmentName, enforcementPointPath);
+        Long portCount = segmentPortsList.getResultCount();
+        portCount = retrySegmentDeletion(segmentPortsService, portCount, segmentName, enforcementPointPath);
         if (segmentPortsList.getResultCount() == 0L) {
             LOGGER.debug(String.format("Removing the segment with ID %s", segmentName));
             removeGroupForSegment(segmentName);
@@ -466,6 +467,25 @@ protected void removeSegment(String segmentName) {
         }
     }
 
+    private PolicyGroupMembersListResult getSegmentPortList(SegmentPorts segmentPortsService, String segmentName, String enforcementPointPath) {
+        return segmentPortsService.list(DEFAULT_DOMAIN, segmentName, null, enforcementPointPath,
+                false, null, 50L, false, null);
+    }
+
+    private Long retrySegmentDeletion(SegmentPorts segmentPortsService, Long portCount, String segmentName, String enforcementPointPath) {
+        int retries = 5;
+        do {
+            try {
+                Thread.sleep(5000);
+                portCount = getSegmentPortList(segmentPortsService, segmentName, enforcementPointPath).getResultCount();
+                retries--;
+            } catch (InterruptedException e) {
+                throw new CloudRuntimeException(String.format("Unable to delete segment %s due to: %s", segmentName, e.getLocalizedMessage()));
+            }
+        } while (retries > 0 && portCount > 0);
+        return portCount;
+    }
+
     public void createStaticNatRule(String vpcName, String tier1GatewayName,
                                     String ruleName, String publicIp, String vmIp) {
         try {
