Merge branch 'ZSTAC-9944' into 'master'

Fix ZSTAC-9944

Closes ZSTAC-9944

See merge request zstackio/zstack!2334

Author: gitlab

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

@@ -57,6 +57,8 @@
 import javax.persistence.LockModeType;
 import javax.persistence.Tuple;
 import javax.persistence.TypedQuery;
+import javax.persistence.metamodel.SingularAttribute;
+
 import java.util.*;
 import java.util.concurrent.Callable;
 
@@ -947,20 +949,36 @@ private void handle(APIGetLocalStorageHostDiskCapacityMsg msg) {
             q.add(LocalStorageHostRefVO_.primaryStorageUuid, Op.EQ, msg.getPrimaryStorageUuid());
             q.add(LocalStorageHostRefVO_.hostUuid, Op.EQ, msg.getHostUuid());
             LocalStorageHostRefVO ref = q.find();
+
+            long total = 0;
+            long available = 0;
+            long availablePhy = 0;
+            long totalPhy = 0;
+
             if (ref == null) {
-                reply.setError(errf.instantiateErrorCode(SysErrors.RESOURCE_NOT_FOUND,
-                        String.format("local primary storage[uuid:%s] doesn't have the host[uuid:%s]",
-                                self.getUuid(), msg.getHostUuid())));
-                bus.reply(msg, reply);
-                return;
+                HostStatus status = Q.New(HostVO.class).select(HostVO_.status)
+                        .eq(HostVO_.uuid, msg.getHostUuid()).findValue();
+                if (status == HostStatus.Connected) {
+                    reply.setError(errf.instantiateErrorCode(SysErrors.RESOURCE_NOT_FOUND,
+                            String.format(
+                                    "local primary storage[uuid:%s] doesn't have the host[uuid:%s]",
+                                    self.getUuid(), msg.getHostUuid())));
+                    bus.reply(msg, reply);
+                    return;
+                }
+            } else {
+                total = ref.getTotalCapacity();
+                available = ref.getAvailableCapacity();
+                availablePhy = ref.getAvailablePhysicalCapacity();
+                totalPhy = ref.getTotalPhysicalCapacity();
             }
 
             HostDiskCapacity c = new HostDiskCapacity();
             c.setHostUuid(msg.getHostUuid());
-            c.setTotalCapacity(ref.getTotalCapacity());
-            c.setAvailableCapacity(ref.getAvailableCapacity());
-            c.setAvailablePhysicalCapacity(ref.getAvailablePhysicalCapacity());
-            c.setTotalPhysicalCapacity(ref.getTotalPhysicalCapacity());
+            c.setTotalCapacity(total);
+            c.setAvailableCapacity(available);
+            c.setAvailablePhysicalCapacity(availablePhy);
+            c.setTotalPhysicalCapacity(totalPhy);
             reply.setInventories(list(c));
         } else {
             SimpleQuery<LocalStorageHostRefVO> q = dbf.createQuery(LocalStorageHostRefVO.class);

test/src/test/groovy/org/zstack/test/integration/storage/primary/local/LocalStorageCalculateCapacityCase.groovy

@@ -0,0 +1,75 @@
+package org.zstack.test.integration.storage.primary.local
+
+import org.springframework.http.HttpEntity
+import org.zstack.kvm.KVMAgentCommands
+import org.zstack.kvm.KVMConstant
+import org.zstack.sdk.ClusterInventory
+import org.zstack.sdk.GetLocalStorageHostDiskCapacityAction
+import org.zstack.sdk.PrimaryStorageInventory
+import org.zstack.test.integration.kvm.Env
+import org.zstack.testlib.EnvSpec
+import org.zstack.testlib.SubCase
+
+class LocalStorageCalculateCapacityCase extends SubCase {
+    EnvSpec env
+    @Override
+    void clean() {
+        env.delete()
+    }
+
+    @Override
+    void setup() {
+        spring {
+            sftpBackupStorage()
+            localStorage()
+            virtualRouter()
+            securityGroup()
+            kvm()
+        }
+    }
+
+    @Override
+    void environment() {
+        env = Env.oneVmBasicEnv()
+    }
+
+    @Override
+    void test() {
+        env.create {
+            testCalculateCapacityWhenAddLocalStorage()
+        }
+    }
+
+    void testCalculateCapacityWhenAddLocalStorage(){
+        ClusterInventory cluster = env.inventoryByName("cluster")
+        PrimaryStorageInventory ps = env.inventoryByName("local")
+
+        boolean temp = false
+
+        env.afterSimulator(KVMConstant.KVM_CONNECT_PATH) { rsp, HttpEntity<String> entity ->
+            rsp.success = true
+
+            def cmd = json(entity.getBody(),KVMAgentCommands.ConnectCmd.class)
+            GetLocalStorageHostDiskCapacityAction action = new GetLocalStorageHostDiskCapacityAction()
+            action.hostUuid = cmd.hostUuid
+            action.primaryStorageUuid = ps.uuid
+            action.sessionId = adminSession()
+            GetLocalStorageHostDiskCapacityAction.Result res = action.call()
+
+            assert res.error == null
+            temp = true
+
+            return rsp
+        }
+
+        addKVMHost {
+            username = "test"
+            password = "password"
+            name = "adding-host"
+            managementIp = "127.0.0.2"
+            clusterUuid  = cluster.uuid
+        }
+
+        assert temp
+    }
+}