[AI] Add host model cache API surface for 5.5.22

VERSION

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

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/allocator/HostAllocatorManagerImpl.java

@@ -237,11 +237,15 @@ public String call(HostUsedCpuMem arg) {
             }
         });
 
-        hostUuids.stream().filter(huuid -> !hostHasVms.contains(huuid)).forEach(huuid -> {
+        for (String huuid : hostUuids) {
+            if (hostHasVms.contains(huuid)) {
+                continue;
+            }
+
             HostUsedCpuMem s = new HostUsedCpuMem();
             s.hostUuid = huuid;
             hostUsedCpuMemList.add(s);
-        });
+        }
 
         for (final HostUsedCpuMem s : hostUsedCpuMemList) {
             new HostCapacityUpdater(s.hostUuid).run(new HostCapacityUpdaterRunnable() {

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/StopVmGC.java

@@ -51,6 +51,7 @@ protected void triggerNow(GCCompletion completion) {
             public void run(FlowTrigger trigger, Map data) {
                 StopVmOnHypervisorMsg msg = new StopVmOnHypervisorMsg();
                 msg.setVmInventory(inventory);
+                msg.setIgnoreNotFoundError(true);
                 bus.makeTargetServiceIdByResourceUuid(msg, HostConstant.SERVICE_ID, hostUuid);
                 bus.send(msg, new CloudBusCallBack(trigger) {
                     @Override
@@ -66,6 +67,16 @@ public void run(MessageReply reply) {
         }).then(new NoRollbackFlow() {
             @Override
             public void run(FlowTrigger trigger, Map data) {
+                String vmHostUuid = Q.New(VmInstanceVO.class).select(VmInstanceVO_.hostUuid)
+                        .eq(VmInstanceVO_.uuid, inventory.getUuid()).findValue();
+                if (!hostUuid.equals(vmHostUuid)) {
+                    logger.debug(String.format("skip changing vm[uuid:%s] state to stopped after StopVmGC, " +
+                            "current host[uuid:%s] is not gc host[uuid:%s]", inventory.getUuid(),
+                            vmHostUuid, hostUuid));
+                    trigger.next();
+                    return;
+                }
+
                 ChangeVmStateMsg cmsg = new ChangeVmStateMsg();
                 cmsg.setVmInstanceUuid(inventory.getUuid());
                 cmsg.setStateEvent(VmInstanceStateEvent.stopped.toString());

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

@@ -21,6 +21,7 @@
 import org.zstack.header.host.HostVO;
 import org.zstack.header.image.ImageConstant.ImageMediaType;
 import org.zstack.header.image.ImageInventory;
+import org.zstack.header.message.APIMessage;
 import org.zstack.header.message.MessageReply;
 import org.zstack.header.network.l3.L3NetworkInventory;
 import org.zstack.header.storage.primary.PrimaryStorageClusterRefVO;
@@ -95,6 +96,9 @@ public String call(L3NetworkInventory arg) {
         }));
         msg.setImage(image);
         msg.setVmOperation(spec.getCurrentVmOperation().toString());
+        if (spec.getMessage() instanceof APIMessage && ((APIMessage) spec.getMessage()).getSystemTags() != null) {
+            msg.setSystemTags(new ArrayList<>(((APIMessage) spec.getMessage()).getSystemTags()));
+        }
 
         if (spec.getVmInventory().getZoneUuid() != null) {
             msg.setZoneUuid(spec.getVmInventory().getZoneUuid());