<fix>[sharedblock]: convert memory snapshot install path from absolute path to protocol path

VERSION

@@ -1,3 +1,3 @@
 MAJOR=5
 MINOR=4
-UPDATE=2
+UPDATE=6

build/deploydb.sh

@@ -27,7 +27,12 @@ else
   loginCmd="--user=$user --password=$password --host=$host --port=$port"
 fi
 
-if command -v greatdb &> /dev/null; then
+# Detect MySQL version
+# Extract major version number from various MySQL/MariaDB/GreatDB output formats
+db_version=$(${MYSQL} --version 2>/dev/null | grep -oP '\d+\.\d+\.\d+' | head -1 | cut -d'.' -f1 || echo "5")
+
+# GreatDB and MySQL 8.0+ require CREATE USER before GRANT
+if command -v greatdb &> /dev/null || [ "$db_version" -ge 8 ] 2>/dev/null; then
   ${MYSQL} ${loginCmd} << EOF
     set global log_bin_trust_function_creators=1;
     DROP DATABASE IF EXISTS zstack;
@@ -42,16 +47,17 @@ if command -v greatdb &> /dev/null; then
     grant all privileges on zstack_rest.* to root@'127.0.0.1';
 EOF
 else
+  # MySQL 5.x: GRANT with IDENTIFIED BY auto-creates users
   ${MYSQL} ${loginCmd} << EOF
-  set global log_bin_trust_function_creators=1;
-  DROP DATABASE IF EXISTS zstack;
-  CREATE DATABASE zstack;
-  DROP DATABASE IF EXISTS zstack_rest;
-  CREATE DATABASE zstack_rest;
-  grant all privileges on zstack.* to root@'%' identified by "${password}";
-  grant all privileges on zstack_rest.* to root@'%' identified by "${password}";
-  grant all privileges on zstack.* to root@'127.0.0.1' identified by "${password}";
-  grant all privileges on zstack_rest.* to root@'127.0.0.1' identified by "${password}";
+    set global log_bin_trust_function_creators=1;
+    DROP DATABASE IF EXISTS zstack;
+    CREATE DATABASE zstack;
+    DROP DATABASE IF EXISTS zstack_rest;
+    CREATE DATABASE zstack_rest;
+    grant all privileges on zstack.* to root@'%' identified by "${password}";
+    grant all privileges on zstack_rest.* to root@'%' identified by "${password}";
+    grant all privileges on zstack.* to root@'127.0.0.1' identified by "${password}";
+    grant all privileges on zstack_rest.* to root@'127.0.0.1' identified by "${password}";
 EOF
 fi
 

build/pom.xml

@@ -495,6 +495,16 @@
                     <artifactId>vpc</artifactId>
                     <version>${project.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.zstack</groupId>
+                    <artifactId>nfvInstGroup</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.zstack</groupId>
+                    <artifactId>nfvInst</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
 
                 <dependency>
                     <groupId>org.zstack</groupId>

compute/src/main/java/org/zstack/compute/allocator/HostAllocatorManagerImpl.java

@@ -530,12 +530,14 @@ public void fail(ErrorCode errorCode) {
 
                 @Override
                 public void rollback(FlowRollback trigger, Map data) {
-                    ReturnHostCapacityMsg rmsg = new ReturnHostCapacityMsg();
-                    rmsg.setHostUuid(reply.getHost().getUuid());
-                    rmsg.setMemoryCapacity(spec.getMemoryCapacity());
-                    rmsg.setCpuCapacity(spec.getCpuCapacity());
-                    bus.makeTargetServiceIdByResourceUuid(rmsg, HostAllocatorConstant.SERVICE_ID, rmsg.getHostUuid());
-                    bus.send(rmsg);
+                    if (reply.getHost() != null) {
+                        ReturnHostCapacityMsg rmsg = new ReturnHostCapacityMsg();
+                        rmsg.setHostUuid(reply.getHost().getUuid());
+                        rmsg.setMemoryCapacity(spec.getMemoryCapacity());
+                        rmsg.setCpuCapacity(spec.getCpuCapacity());
+                        bus.makeTargetServiceIdByResourceUuid(rmsg, HostAllocatorConstant.SERVICE_ID, rmsg.getHostUuid());
+                        bus.send(rmsg);
+                    }
                     trigger.rollback();
                 }
             }).then(new NoRollbackFlow() {

compute/src/main/java/org/zstack/compute/allocator/HostSortorChain.java

@@ -195,7 +195,11 @@ public void fail(ErrorCode errorCode) {
             @Override
             public void done(ErrorCodeList errorCodeList) {
                 if (selectedHost.get() == null) {
-                    completion.fail(errorCodeList);
+                    if (!errorCodeList.getCauses().isEmpty()) {
+                        completion.fail(errorCodeList.getCauses().get(0));
+                    } else {
+                        completion.fail(operr("failed to reserve host capacity for all candidate hosts"));
+                    }
                     return;
                 }
                 completion.success(selectedHost.get());

compute/src/main/java/org/zstack/compute/allocator/SysComponentMemUsageExtensionPoint.java

@@ -0,0 +1,17 @@
+package org.zstack.compute.allocator;
+
+public interface SysComponentMemUsageExtensionPoint {
+    /**
+     * Retrieves the amount of huge page memory used by the system component (in byte).
+     *
+     * @return the number of byte of huge page memory in use
+     */
+    long getHugePageMemoryUsage(String hostUuid);
+
+    /**
+     * Retrieves the amount of normal memory used by the system component (in byte).
+     *
+     * @return the number of byte of normal memory in use
+     */
+    long getNormalMemoryUsage(String hostUuid);
+}

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

@@ -109,4 +109,7 @@ public class HostSystemTags {
 
     public static String DEPLOY_MODE_TOKEN = "deployMode";
     public static PatternedSystemTag DEPLOY_MODE = new PatternedSystemTag(String.format("deployMode::{%s}", DEPLOY_MODE_TOKEN), HostVO.class);
+
+    public static String HYGON_MDEV_MAX_QEMU_NUM_TOKEN = "hygonMdevMaxQemuNum";
+    public static PatternedSystemTag HYGON_MDEV_MAX_QEMU_NUM = new PatternedSystemTag(String.format("hygonMdevMaxQemuNum::{%s}", HYGON_MDEV_MAX_QEMU_NUM_TOKEN), HostVO.class);
 }

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

@@ -65,6 +65,7 @@ public abstract class AbstractVmInstance implements VmInstance {
                 AttachIsoToVmInstanceMsg.class.getName(),
                 APIDetachIsoFromVmInstanceMsg.class.getName(),
                 APIGetVmConsoleAddressMsg.class.getName(),
+                APIUpdateConsolePasswordMsg.class.getName(),
                 APIDeleteVmStaticIpMsg.class.getName(),
                 APIPauseVmInstanceMsg.class.getName(),
                 CreateTemplateFromRootVolumeSnapShotVmMsg.class.getName(),

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

@@ -127,7 +127,7 @@ public boolean checkDuplicateMac(String hypervisorType, String l3Uuid, String ma
     public static String generateMacWithDeviceId(short deviceId) {
         VmMacAddressSchemaType type;
         try {
-            type = VmMacAddressSchemaType.valueOf(VmGlobalProperty.vmMacAddressSchema.toLowerCase());
+            type = VmMacAddressSchemaType.valueOf(VmGlobalProperty.vmMacAddressSchema);
         } catch (Exception e) {
             type = VmMacAddressSchemaType.Random;
         }
@@ -148,8 +148,8 @@ public static String generateMacWithDeviceIdIp(short deviceId) {
         }
 
         /* encode mgt ip address into mac address: for example,
-        * mgt ip is: 172.24.0.81, its hex string: AC 18 0 51,
-        * so mac address will look like: 18:00:51:xx:xx:yy
+        * mgt ip is: 172.24.0.81, its hex string: AC 18 00 51,
+        * so mac address will look like: fa:00:51:xx:xx:yy
         * xx:xx are random. yy is device ID */
         int mgtIpL = (int)NetworkUtils.ipv4StringToLong(mgtIp);
         String mgtIpStr = Integer.toHexString(mgtIpL);
@@ -158,7 +158,7 @@ public static String generateMacWithDeviceIdIp(short deviceId) {
             mgtIpStr = compensate + mgtIpStr;
         }
 
-        StringBuilder sb = new StringBuilder(mgtIpStr.substring(2, 4)).append(":");
+        StringBuilder sb = new StringBuilder("fa").append(":");
         sb.append(mgtIpStr, 4, 6).append(":");
         sb.append(mgtIpStr, 6, 8).append(":");
 

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

@@ -318,8 +318,7 @@ public void validateSystemTagInCreateMessage(APICreateMessage msg) {
         validateSystemTagInApiMessage(msg);
     }
 
-    public void validateSystemTagInApiMessage(APIMessage msg) {
-        Map<String, NicIpAddressInfo> staticIps = getNicNetworkInfoBySystemTag(msg.getSystemTags());
+    public List<String> fillUpStaticIpInfoToVmNics(Map<String, NicIpAddressInfo> staticIps) {
         List<String> newSystags = new ArrayList<>();
         for (Map.Entry<String, NicIpAddressInfo> e : staticIps.entrySet()) {
             String l3Uuid = e.getKey();
@@ -350,7 +349,7 @@ public void validateSystemTagInApiMessage(APIMessage msg) {
                         ));
                     } else if (!nicIp.ipv4Netmask.equals(ipRangeVO.getNetmask())) {
                         throw new ApiMessageInterceptionException(operr("netmask error, expect: %s, got: %s",
-                                    ipRangeVO.getNetmask(), nicIp.ipv4Netmask));
+                                ipRangeVO.getNetmask(), nicIp.ipv4Netmask));
                     }
 
                     if (StringUtils.isEmpty(nicIp.ipv4Gateway)) {
@@ -397,10 +396,16 @@ public void validateSystemTagInApiMessage(APIMessage msg) {
                     }
                 }
             }
+        }
 
-            if (!newSystags.isEmpty()) {
-                msg.getSystemTags().addAll(newSystags);
-            }
+        return newSystags;
+    }
+
+    public void validateSystemTagInApiMessage(APIMessage msg) {
+        Map<String, NicIpAddressInfo> staticIps = getNicNetworkInfoBySystemTag(msg.getSystemTags());
+        List<String> newSystags = fillUpStaticIpInfoToVmNics(staticIps);
+        if (!newSystags.isEmpty()) {
+            msg.getSystemTags().addAll(newSystags);
         }
     }
 

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

@@ -133,4 +133,8 @@ public class VmGlobalConfig {
     @GlobalConfigValidation(validValues = {"None", "AuthenticAMD"})
     @BindResourceConfig(value = {VmInstanceVO.class})
     public static GlobalConfig VM_CPUID_VENDOR = new GlobalConfig(CATEGORY, "vm.cpuid.vendor");
+
+    @GlobalConfigValidation(validValues = {"true", "false", "auto"})
+    @GlobalConfigDef(defaultValue = "false", type = String.class, description = "generate config required for vhost primary storage")
+    public static GlobalConfig GENERATE_CONFIG_VHOST_REQUIRED = new GlobalConfig(CATEGORY, "generate.config.vhost.required");
 }

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

@@ -9,6 +9,8 @@
 import org.zstack.compute.VmNicUtils;
 import org.zstack.core.cloudbus.CloudBus;
 import org.zstack.core.componentloader.PluginRegistry;
+import org.zstack.core.config.GlobalConfigVO;
+import org.zstack.core.config.GlobalConfigVO_;
 import org.zstack.core.db.*;
 import org.zstack.core.db.SimpleQuery.Op;
 import org.zstack.header.apimediator.ApiMessageInterceptionException;
@@ -137,6 +139,8 @@ else if (msg instanceof APIAttachVmNicToVmMsg) {
             validate((APIUpdateVmInstanceMsg) msg);
         } else if (msg instanceof APISetVmConsolePasswordMsg) {
             validate((APISetVmConsolePasswordMsg) msg);
+        } else if (msg instanceof APIUpdateConsolePasswordMsg) {
+            validate((APIUpdateConsolePasswordMsg) msg);
         } else if (msg instanceof APIChangeInstanceOfferingMsg) {
             validate((APIChangeInstanceOfferingMsg) msg);
         } else if (msg instanceof APIMigrateVmMsg) {
@@ -1533,6 +1537,23 @@ private void validate(APISetVmConsolePasswordMsg msg) {
         }
     }
 
+    private void validate(APIUpdateConsolePasswordMsg msg) {
+        VmInstanceVO vm = dbf.findByUuid(msg.getUuid(), VmInstanceVO.class);
+        if (vm.getState() != VmInstanceState.Running) {
+            throw new ApiMessageInterceptionException(operr(
+                    "Cannot update console password for VM[uuid:%s] because it is not in 'Running' state. Current state is '%s'.",
+                    vm.getUuid(), vm.getState()
+            ));
+        }
+        boolean hasPassword = VmSystemTags.CONSOLE_PASSWORD.hasTag(vm.getUuid());
+        if (!hasPassword) {
+            throw new ApiMessageInterceptionException(operr(
+                    "Cannot update the console password for VM[uuid:%s] because no console password is currently set. ",
+                    vm.getUuid()
+            ));
+        }
+    }
+
     private void validate(APIAttachL3NetworkToVmNicMsg msg) {
         throw new ApiMessageInterceptionException(argerr("can not call this api because it's Deprecated"));
     }