<fix>[localstorage]: fix error message in LocalStorageMainAllocatorFlow

This patch is for zsv_4.10.28

Related: ZSV-10444

Change-Id: I68786e677666656666746868766d646c67616b69

Author: Zhang Wenhao

plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageMainAllocatorFlow.java

@@ -43,8 +43,7 @@ public class LocalStorageMainAllocatorFlow extends NoRollbackFlow {
 
     private class Result {
         List<PrimaryStorageVO> result;
-        String errStr;
-        List<ErrorCode> causes = new ArrayList<>();
+        ErrorCode errorCode;
     }
 
     @Transactional(readOnly = true)
@@ -77,7 +76,7 @@ private Result allocate(Map data) {
             query.setParameter("hstate", HostState.Enabled);
             query.setParameter("hstatus", HostStatus.Connected);
             query.setParameter("ptype", LocalStorageConstants.LOCAL_STORAGE_TYPE);
-            ret.errStr = i18n("the required host[uuid:%s] cannot satisfy conditions[state: %s, status: %s, size > %s bytes]," +
+            ret.errorCode = operr("the required host[uuid:%s] cannot satisfy conditions[state: %s, status: %s, size > %s bytes]," +
                             " or doesn't belong to a local primary storage satisfying conditions[state: %s, status: %s]," +
                             " or its cluster doesn't attach to any local primary storage",
                     spec.getRequiredHostUuid(),
@@ -105,7 +104,7 @@ private Result allocate(Map data) {
             query.setParameter("hstate", HostState.Enabled);
             query.setParameter("hstatus", HostStatus.Connected);
             query.setParameter("ptype", LocalStorageConstants.LOCAL_STORAGE_TYPE);
-            ret.errStr = i18n("no local primary storage in zone[uuid:%s] can satisfy conditions[state: %s, status: %s]" +
+            ret.errorCode = operr("no local primary storage in zone[uuid:%s] can satisfy conditions[state: %s, status: %s]" +
                             " or contain hosts satisfying conditions[state: %s, status: %s, size > %s bytes]",
                     spec.getRequiredZoneUuid(),
                     PrimaryStorageState.Enabled,
@@ -131,7 +130,7 @@ private Result allocate(Map data) {
             query.setParameter("hstatus", HostStatus.Connected);
             query.setParameter("ptype", LocalStorageConstants.LOCAL_STORAGE_TYPE);
 
-            ret.errStr = i18n("no local primary storage can satisfy conditions[state: %s, status: %s]" +
+            ret.errorCode = operr("no local primary storage can satisfy conditions[state: %s, status: %s]" +
                             " or contain hosts satisfying conditions[state: %s, status: %s, size > %s bytes]",
                     PrimaryStorageState.Enabled,
                     PrimaryStorageStatus.Connected,
@@ -173,13 +172,13 @@ private Result allocate(Map data) {
                 LocalStorageHostRefVO ref = it.next();
                 if (!physicalCapacityMgr.checkCapacityByRatio(ref.getPrimaryStorageUuid(), ref.getTotalPhysicalCapacity(), ref.getAvailablePhysicalCapacity())
                         || !physicalCapacityMgr.checkRequiredCapacityByRatio(ref.getPrimaryStorageUuid(), ref.getTotalPhysicalCapacity(), spec.getTotalSize())) {
-                    ret.causes.add(operr("{the physical capacity usage of the host[uuid:%s] has exceeded the threshold[%s]}",
+                    errs.add(operr("{the physical capacity usage of the host[uuid:%s] has exceeded the threshold[%s]}",
                             ref.getHostUuid(), physicalCapacityMgr.getRatio(ref.getPrimaryStorageUuid())));
                     it.remove();
                 }
             }
             if (candidateHosts.isEmpty()) {
-                ret.errStr = i18n("failed allocate localstorage");
+                ret.errorCode = operr("failed allocate localstorage").withCause(errs);
             }
         }
         Set<String> candidates = new HashSet<>();
@@ -289,7 +288,7 @@ public void run(FlowTrigger trigger, Map data) {
             return;
         }
 
-        ErrorCode err = ret.causes.isEmpty() ? operr(ret.errStr) : multiErr(ret.causes, ret.errStr);
+        ErrorCode err = ret.errorCode;
         trigger.fail(err);
     }
 }

test/src/test/groovy/org/zstack/test/integration/kvm/vm/CreateVmWithDesignatedPSCase.groovy

@@ -145,18 +145,18 @@ class CreateVmWithDesignatedPSCase extends SubCase {
                 return it["hostUuid"] == kvm1.uuid
             }
             assert candidates1.size() == 1
-            assert it["hostName"] == "kvm1"
-            assert it["reject"] == Platform.i18n("not accessible to the specific primary storage")
-            assert it["rejectBy"] == "HostPrimaryStorageAllocatorFlow"
+            assert candidates1[0]["hostName"] == "kvm1"
+            assert candidates1[0]["reject"] == Platform.i18n("not accessible to the specific primary storage")
+            assert candidates1[0]["rejectBy"] == "HostPrimaryStorageAllocatorFlow"
 
             def kvm2 = env.inventoryByName("kvm2") as HostInventory
             def candidates2 = rejectedCandidates.findAll {
                 return it["hostUuid"] == kvm2.uuid
             }
             assert candidates2.size() == 1
-            assert it["hostName"] == "kvm2"
-            assert it["reject"] == Platform.i18n("not accessible to the specific primary storage")
-            assert it["rejectBy"] == "HostPrimaryStorageAllocatorFlow"
+            assert candidates2[0]["hostName"] == "kvm2"
+            assert candidates2[0]["reject"] == Platform.i18n("not accessible to the specific primary storage")
+            assert candidates2[0]["rejectBy"] == "HostPrimaryStorageAllocatorFlow"
         }
     }