<fix>[network]: ZCF-3703 rollback failed service attach

VERSION

@@ -1,3 +1,3 @@
 MAJOR=5
 MINOR=5
-UPDATE=16
+UPDATE=22

abstraction/src/main/java/org/zstack/abstraction/sso/OAuth2PluginConstants.java

@@ -46,4 +46,7 @@ public interface OAuth2PluginConstants {
     String ZF_PROVIDER_NAME = "zf";
     String ALI_PROVIDER_NAME = "ali_idaas_private";
     String MAX_KEY_PROVIDER_NAME = "max_key";
+    String ZIAM_PROVIDER_NAME = "ziam";
+    String LOGIN_TYPE_IAM2_ROPC = "iam2_ropc";
+    String ZIAM_DEFAULT_SCOPE = "openid profile email";
 }

build/pom.xml

@@ -636,6 +636,11 @@
                     <artifactId>ovn</artifactId>
                     <version>${project.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.zstack</groupId>
+                    <artifactId>zns</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>org.zstack</groupId>
                     <artifactId>observabilityServer</artifactId>

compute/src/main/java/org/zstack/compute/host/HostTrackImpl.java

@@ -36,6 +36,7 @@ public class HostTrackImpl implements HostTracker, ManagementNodeChangeListener,
     private final static CLogger logger = Utils.getLogger(HostTrackImpl.class);
 
     private Map<String, Tracker> trackers = new ConcurrentHashMap<>();
+    private volatile boolean stopped;
     private static boolean alwaysStartRightNow = false;
     private static final Cache<String, Long> skippedPingHostDeadline = CacheBuilder.newBuilder().expireAfterWrite(1, TimeUnit.HOURS).build();
 
@@ -251,6 +252,11 @@ public void cancel() {
 
 
     public void trackHost(String hostUuid) {
+        if (stopped) {
+            logger.debug(String.format("skip tracking host[uuid:%s], host tracker is stopped", hostUuid));
+            return;
+        }
+
         if (!destMaker.isManagedByUs(hostUuid)) {
             logger.debug(String.format("skip tracking host[uuid:%s], not managed by us", hostUuid));
             return;
@@ -285,6 +291,11 @@ public void untrackHost(String huuid) {
 
     @Override
     public void trackHost(Collection<String> huuids) {
+        if (stopped) {
+            logger.debug(String.format("skip tracking hosts%s, host tracker is stopped", huuids));
+            return;
+        }
+
         huuids.forEach(this::trackHost);
     }
 
@@ -353,6 +364,7 @@ private HostReconnectTaskFactory getHostReconnectTaskFactory(String hvType) {
 
     @Override
     public boolean start() {
+        stopped = false;
         populateExtensions();
         onHostStatusChange();
         onHostPingSkip();
@@ -421,6 +433,9 @@ protected void run(Map tokens, Object data) {
 
     @Override
     public boolean stop() {
+        stopped = true;
+        new HashSet<>(trackers.values()).forEach(Tracker::cancel);
+        trackers.clear();
         return true;
     }
 }

compute/src/main/java/org/zstack/compute/vm/VmAllocateSdnNicFlow.java

@@ -0,0 +1,131 @@
+package org.zstack.compute.vm;
+
+import org.springframework.beans.factory.annotation.Autowire;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
+import org.zstack.core.asyncbatch.While;
+import org.zstack.core.componentloader.PluginRegistry;
+import org.zstack.header.core.Completion;
+import org.zstack.header.core.WhileDoneCompletion;
+import org.zstack.header.core.workflow.Flow;
+import org.zstack.header.core.workflow.FlowRollback;
+import org.zstack.header.core.workflow.FlowTrigger;
+import org.zstack.header.errorcode.ErrorCode;
+import org.zstack.header.errorcode.ErrorCodeList;
+import org.zstack.header.network.l3.UsedIpInventory;
+import org.zstack.header.network.sdncontroller.SdnControllerConstant;
+import org.zstack.header.vm.*;
+import org.zstack.utils.Utils;
+import org.zstack.utils.logging.CLogger;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.zstack.core.progress.ProgressReportService.taskProgress;
+
+/**
+ * Placed after VmAllocateNicIpFlow in the flow chain.
+ *
+ * For each NIC belonging to an SDN-managed L2 network, this flow delegates
+ * to the registered {@link AfterAllocateSdnNicExtensionPoint} implementations
+ * (typically {@code SdnControllerManagerImpl}) which:
+ *
+ * - OVN: calls addLogicalPorts() with already-allocated IPs
+ * - ZNS: calls createSegmentPort(), receives IP back from ZNS, writes to DB
+ * - H3C/Sugon: default no-op
+ *
+ * Non-SDN NICs are skipped by the extension implementation internally.
+ */
+@Configurable(preConstruction = true, autowire = Autowire.BY_TYPE)
+public class VmAllocateSdnNicFlow implements Flow {
+    private static final CLogger logger = Utils.getLogger(VmAllocateSdnNicFlow.class);
+
+    @Autowired
+    private PluginRegistry pluginRgty;
+
+    @Override
+    public void run(final FlowTrigger trigger, final Map data) {
+        taskProgress("create SDN ports for nics");
+
+        final VmInstanceSpec spec = (VmInstanceSpec) data.get(VmInstanceConstant.Params.VmInstanceSpec.toString());
+        final List<VmNicInventory> nics = spec.getDestNics();
+        List<UsedIpInventory> allocatedIpsOnStart = (List<UsedIpInventory>) data.get(VmAllocateNicForStartingVmFlow.class);
+        if (allocatedIpsOnStart != null) {
+            spec.putExtensionData(SdnControllerConstant.ALLOCATED_IPS_ON_START, allocatedIpsOnStart.stream()
+                    .map(UsedIpInventory::getVmNicUuid)
+                    .collect(Collectors.toList()));
+        }
+
+        if (nics == null || nics.isEmpty()) {
+            trigger.next();
+            return;
+        }
+
+        List<AfterAllocateSdnNicExtensionPoint> exts =
+                pluginRgty.getExtensionList(AfterAllocateSdnNicExtensionPoint.class);
+        if (exts.isEmpty()) {
+            trigger.next();
+            return;
+        }
+
+        new While<>(exts).each((ext, wcomp) -> {
+            ext.afterAllocateSdnNic(spec, nics, new Completion(wcomp) {
+                @Override
+                public void success() {
+                    wcomp.done();
+                }
+
+                @Override
+                public void fail(ErrorCode errorCode) {
+                    wcomp.addError(errorCode);
+                    wcomp.allDone();
+                }
+            });
+        }).run(new WhileDoneCompletion(trigger) {
+            @Override
+            public void done(ErrorCodeList errorCodeList) {
+                if (!errorCodeList.getCauses().isEmpty()) {
+                    trigger.fail(errorCodeList.getCauses().get(0));
+                } else {
+                    trigger.next();
+                }
+            }
+        });
+    }
+
+    @Override
+    public void rollback(final FlowRollback chain, Map data) {
+        final VmInstanceSpec spec = (VmInstanceSpec) data.get(VmInstanceConstant.Params.VmInstanceSpec.toString());
+        final List<VmNicInventory> nics = spec.getDestNics();
+
+        List<AfterAllocateSdnNicExtensionPoint> exts =
+                pluginRgty.getExtensionList(AfterAllocateSdnNicExtensionPoint.class);
+
+        if (exts.isEmpty() || nics == null || nics.isEmpty()) {
+            chain.rollback();
+            return;
+        }
+
+        new While<>(exts).each((ext, wcomp) -> {
+            ext.rollbackSdnNic(spec, nics, new Completion(wcomp) {
+                @Override
+                public void success() {
+                    wcomp.done();
+                }
+
+                @Override
+                public void fail(ErrorCode errorCode) {
+                    // best-effort: log and continue
+                    logger.warn(String.format("failed to rollback SDN nic: %s", errorCode));
+                    wcomp.done();
+                }
+            });
+        }).run(new WhileDoneCompletion(chain) {
+            @Override
+            public void done(ErrorCodeList errorCodeList) {
+                chain.rollback();
+            }
+        });
+    }
+}

compute/src/main/java/org/zstack/compute/vm/VmCascadeExtension.java

@@ -325,6 +325,7 @@ protected List<DetachNicFromVmMsg> handleDeletionForIpRange(List<VmDeletionStruc
             }
         }
 
+
         return msgs;
     }
 

compute/src/main/java/org/zstack/compute/vm/VmDetachNicFlow.java

@@ -6,11 +6,14 @@
 import org.zstack.core.asyncbatch.While;
 import org.zstack.core.cloudbus.CloudBus;
 import org.zstack.core.cloudbus.CloudBusCallBack;
+import org.zstack.core.componentloader.PluginRegistry;
 import org.zstack.core.db.DatabaseFacade;
 import org.zstack.core.db.UpdateQuery;
+import org.zstack.header.core.Completion;
 import org.zstack.header.core.WhileDoneCompletion;
 import org.zstack.header.core.workflow.FlowTrigger;
 import org.zstack.header.core.workflow.NoRollbackFlow;
+import org.zstack.header.errorcode.ErrorCode;
 import org.zstack.header.errorcode.ErrorCodeList;
 import org.zstack.header.message.MessageReply;
 import org.zstack.header.network.l3.L3NetworkConstant;
@@ -20,19 +23,28 @@
 import org.zstack.utils.CollectionUtils;
 import org.zstack.utils.function.Function;
 
+import org.zstack.utils.Utils;
+import org.zstack.utils.logging.CLogger;
+
+import java.util.List;
 import java.util.Map;
 
 /**
  * Created by frank on 7/18/2015.
  */
 @Configurable(preConstruction = true, autowire = Autowire.BY_TYPE)
 public class VmDetachNicFlow extends NoRollbackFlow {
+    private static final CLogger logger = Utils.getLogger(VmDetachNicFlow.class);
     @Autowired
     private DatabaseFacade dbf;
     @Autowired
     private CloudBus bus;
     @Autowired
     private VmInstanceDeviceManager vidm;
+    @Autowired
+    private VmInstanceManager vmMgr;
+    @Autowired
+    private PluginRegistry pluginRgty;
 
     @Override
     public void run(FlowTrigger trigger, Map data) {
@@ -68,6 +80,10 @@ public String call(VmNicInventory arg) {
             return;
         }
 
+        returnIpsAndDeleteNic(nic, trigger);
+    }
+
+    private void returnIpsAndDeleteNic(VmNicInventory nic, FlowTrigger trigger) {
         new While<>(nic.getUsedIps()).all((ip, comp) -> {
             ReturnIpMsg msg = new ReturnIpMsg();
             msg.setUsedIpUuid(ip.getUuid());
@@ -82,9 +98,51 @@ public void run(MessageReply reply) {
         }).run(new WhileDoneCompletion(trigger){
             @Override
             public void done(ErrorCodeList errorCodeList) {
-                dbf.removeByPrimaryKey(nic.getUuid(), VmNicVO.class);
-                trigger.next();
+                callReleaseSdnNics(java.util.Collections.singletonList(nic), new Completion(trigger) {
+                    @Override
+                    public void success() {
+                        dbf.removeByPrimaryKey(nic.getUuid(), VmNicVO.class);
+                        trigger.next();
+                    }
+
+                    @Override
+                    public void fail(ErrorCode errorCode) {
+                        logger.warn(String.format("releaseSdnNics failed for nic[uuid:%s]: %s, continue",
+                                nic.getUuid(), errorCode));
+                        dbf.removeByPrimaryKey(nic.getUuid(), VmNicVO.class);
+                        trigger.next();
+                    }
+                });
+            }
+        });
+    }
+
+    private void callReleaseSdnNics(List<VmNicInventory> nics, Completion completion) {
+        List<AfterAllocateSdnNicExtensionPoint> exts = pluginRgty.getExtensionList(AfterAllocateSdnNicExtensionPoint.class);
+        if (exts.isEmpty()) {
+            completion.success();
+            return;
+        }
+
+        new While<>(exts).each((ext, wcomp) -> {
+            ext.releaseSdnNics(nics, new Completion(wcomp) {
+                @Override
+                public void success() {
+                    wcomp.done();
+                }
+
+                @Override
+                public void fail(ErrorCode errorCode) {
+                    logger.warn(String.format("releaseSdnNics extension failed: %s, continue", errorCode));
+                    wcomp.done();
+                }
+            });
+        }).run(new WhileDoneCompletion(completion) {
+            @Override
+            public void done(ErrorCodeList errorCodeList) {
+                completion.success();
             }
         });
     }
+
 }