Merge branch 'fix_bug_10005_@@2' into 'master'

fix data volume bill bug (fix ZSTAC-10005)

Closes ZSTAC-10005

See merge request zstackio/zstack!2378

Author: gitlab

header/src/main/java/org/zstack/header/volume/VolumeCanonicalEvents.java

@@ -17,6 +17,7 @@ public static class VolumeStatusChangedData {
         private String newStatus;
         private VolumeInventory inventory;
         private Date date = new Date();
+        private String accountUuid;
 
         public String getVolumeUuid() {
             return volumeUuid;
@@ -57,5 +58,13 @@ public Date getDate() {
         public void setDate(Date date) {
             this.date = date;
         }
+
+        public String getAccountUuid() {
+            return accountUuid;
+        }
+
+        public void setAccountUuid(String accountUuid) {
+            this.accountUuid = accountUuid;
+        }
     }
 }

storage/src/main/java/org/zstack/storage/volume/FireVolumeCanonicalEvent.java

@@ -4,10 +4,12 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.zstack.core.cloudbus.EventFacade;
+import org.zstack.core.db.Q;
+import org.zstack.header.identity.AccountResourceRefVO;
+import org.zstack.header.identity.AccountResourceRefVO_;
 import org.zstack.header.volume.VolumeCanonicalEvents;
 import org.zstack.header.volume.VolumeInventory;
 import org.zstack.header.volume.VolumeStatus;
-
 import java.util.Date;
 
 /**
@@ -19,12 +21,23 @@ public class FireVolumeCanonicalEvent {
     private EventFacade evtf;
 
     public void fireVolumeStatusChangedEvent(VolumeStatus oldStatus, VolumeInventory vol) {
+
+        String accountUuid = null;
+
+        boolean volumeAccountExists =  Q.New(AccountResourceRefVO.class).gt(AccountResourceRefVO_.resourceUuid, vol.getUuid()).isExists();
+        if (volumeAccountExists) {
+            accountUuid = Q.New(AccountResourceRefVO.class)
+                    .select(AccountResourceRefVO_.ownerAccountUuid)
+                    .gt(AccountResourceRefVO_.resourceUuid, vol.getUuid()).limit(1).findValue();
+        }
+
         VolumeCanonicalEvents.VolumeStatusChangedData d = new VolumeCanonicalEvents.VolumeStatusChangedData();
         d.setInventory(vol);
         d.setDate(new Date());
         d.setNewStatus(vol.getStatus());
         d.setOldStatus(oldStatus == null ? null : oldStatus.toString());
         d.setVolumeUuid(vol.getUuid());
+        d.setAccountUuid(accountUuid);
         evtf.fire(VolumeCanonicalEvents.VOLUME_STATUS_CHANGED_PATH, d);
     }
 }

storage/src/main/java/org/zstack/storage/volume/VolumeBase.java

@@ -780,7 +780,9 @@ public void handle(Map data) {
                             self = dbf.updateAndRefresh(self);
                             new FireVolumeCanonicalEvent().fireVolumeStatusChangedEvent(oldStatus, getSelfInventory());
                         } else if (deletionPolicy == VolumeDeletionPolicy.DBOnly) {
-                            new FireVolumeCanonicalEvent().fireVolumeStatusChangedEvent(oldStatus, getSelfInventory());
+                            VolumeInventory inventory = getSelfInventory();
+                            inventory.setStatus(VolumeStatus.Deleted.toString());
+                            new FireVolumeCanonicalEvent().fireVolumeStatusChangedEvent(oldStatus, inventory);
                             dbf.remove(self);
                         } else {
                             throw new CloudRuntimeException(String.format("Invalid deletionPolicy:%s", deletionPolicy));