Merge branch 'fix/cre-batch-quality-issues@@2' into '5.5.12'

<fix>[multi]: batch fix CRE quality issues

See merge request zstackio/zstack!9214

Author: gitlab

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

@@ -851,17 +851,15 @@ public HostCapacityVO call(HostCapacityVO cap) {
                     long deltaMemory = ratioMgr.calculateMemoryByRatio(hostUuid, memory);
                     long availMemory = cap.getAvailableMemory() + deltaMemory;
                     if (availMemory > cap.getTotalMemory()) {
-                        throw new CloudRuntimeException(
-                                String.format("invalid memory capacity of host[uuid:%s]," +
-                                                " available memory[%s] is greater than total memory[%s]." +
-                                                " Available Memory before is [%s], Delta Memory is [%s].",
-                                        hostUuid,
-                                        new DecimalFormat(",###").format(availMemory),
-                                        new DecimalFormat(",###").format(cap.getTotalMemory()),
-                                        new DecimalFormat(",###").format(cap.getAvailableMemory()),
-                                        new DecimalFormat(",###").format(deltaMemory)
-                                )
-                        );
+                        logger.warn(String.format("memory capacity overflow on host[uuid:%s]," +
+                                        " available memory[%s] > total memory[%s], clamping to total." +
+                                        " Available Memory before is [%s], Delta Memory is [%s].",
+                                hostUuid,
+                                new DecimalFormat(",###").format(availMemory),
+                                new DecimalFormat(",###").format(cap.getTotalMemory()),
+                                new DecimalFormat(",###").format(cap.getAvailableMemory()),
+                                new DecimalFormat(",###").format(deltaMemory)));
+                        availMemory = cap.getTotalMemory();
                     }
 
                     cap.setAvailableMemory(availMemory);

plugin/ldap/src/main/java/org/zstack/ldap/LdapUtil.java

@@ -657,10 +657,10 @@ public LdapServerVO getLdapServer() {
         sq.add(LdapServerVO_.scope, SimpleQuery.Op.EQ, scope);
         List<LdapServerVO> ldapServers = sq.list();
         if (ldapServers.isEmpty()) {
-            throw new CloudRuntimeException("No LDAP/AD server record in database.");
+            throw new OperationFailureException(operr(ORG_ZSTACK_LDAP_10020, "No LDAP/AD server record in database."));
         }
         if (ldapServers.size() > 1) {
-            throw new CloudRuntimeException("More than one LDAP/AD server record in database.");
+            throw new OperationFailureException(operr(ORG_ZSTACK_LDAP_10021, "More than one LDAP/AD server record in database."));
         }
         return ldapServers.get(0);
     }

search/src/main/java/org/zstack/query/QueryFacadeImpl.java

@@ -378,7 +378,7 @@ private void handle(APIQueryMessage msg) {
         } catch (OperationFailureException of) {
             throw of;
         } catch (Exception e) {
-            throw new CloudRuntimeException(e);
+            throw new OperationFailureException(inerr("failed to query: %s", e.getMessage()));
         }
     }
 

utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java

@@ -1654,6 +1654,10 @@ public class CloudOperationsErrorCode {
 
     public static final String ORG_ZSTACK_LDAP_10019 = "ORG_ZSTACK_LDAP_10019";
 
+    public static final String ORG_ZSTACK_LDAP_10020 = "ORG_ZSTACK_LDAP_10020";
+
+    public static final String ORG_ZSTACK_LDAP_10021 = "ORG_ZSTACK_LDAP_10021";
+
     public static final String ORG_ZSTACK_IMAGE_10000 = "ORG_ZSTACK_IMAGE_10000";
 
     public static final String ORG_ZSTACK_IMAGE_10001 = "ORG_ZSTACK_IMAGE_10001";
@@ -10654,6 +10658,8 @@ public class CloudOperationsErrorCode {
 
     public static final String ORG_ZSTACK_PREMIUM_EXTERNALSERVICE_PROMETHEUS_10013 = "ORG_ZSTACK_PREMIUM_EXTERNALSERVICE_PROMETHEUS_10013";
 
+    public static final String ORG_ZSTACK_PREMIUM_EXTERNALSERVICE_PROMETHEUS_10014 = "ORG_ZSTACK_PREMIUM_EXTERNALSERVICE_PROMETHEUS_10014";
+
     public static final String ORG_ZSTACK_AI_CONTAINER_10000 = "ORG_ZSTACK_AI_CONTAINER_10000";
 
     public static final String ORG_ZSTACK_AI_CONTAINER_10001 = "ORG_ZSTACK_AI_CONTAINER_10001";