Merge branch 'fix-45747@@2' into 'master'

<fix>[storage]: get volume accountUuid without null check

See merge request zstackio/zstack!3494

Author: gitlab

core/src/main/java/org/zstack/core/aspect/AspectCompleter.java

@@ -0,0 +1,22 @@
+package org.zstack.core.aspect;
+
+import org.zstack.core.db.Q;
+import org.zstack.header.aspect.OwnedByAccountAspect;
+import org.zstack.header.core.StaticInit;
+import org.zstack.header.identity.AccountResourceRefVO;
+import org.zstack.header.identity.AccountResourceRefVO_;
+
+import java.util.function.Function;
+
+public class AspectCompleter {
+    @StaticInit
+    static void staticinit() {
+        OwnedByAccountAspect.setAccountUuidGetter(new Function<String, String>() {
+            @Override
+            public String apply(String s) {
+                return Q.New(AccountResourceRefVO.class).select(AccountResourceRefVO_.accountUuid)
+                        .eq(AccountResourceRefVO_.resourceUuid, s).findValue();
+            }
+        });
+    }
+}

core/src/main/java/org/zstack/core/aspect/EncryptColumnAspect.aj

@@ -16,7 +16,7 @@ import java.lang.reflect.Field;
  * @Date: 2021/12/2
  */
 public aspect EncryptColumnAspect {
-     private static final CLogger logger = Utils.getLogger(OwnedByAccountAspect.class);
+     private static final CLogger logger = Utils.getLogger(EncryptColumnAspect.class);
 
     @Autowired
     protected PluginRegistry pluginRegistry;

…tack/core/aspect/OwnedByAccountAspect.aj …ck/header/aspect/OwnedByAccountAspect.ajcore/src/main/java/org/zstack/core/aspect/OwnedByAccountAspect.aj renamed to header/src/main/java/org/zstack/header/aspect/OwnedByAccountAspect.aj core/src/main/java/org/zstack/core/aspect/OwnedByAccountAspect.aj renamed to header/src/main/java/org/zstack/header/aspect/OwnedByAccountAspect.aj

@@ -1,24 +1,31 @@
-package org.zstack.core.aspect;
+package org.zstack.header.aspect;
 
-import org.zstack.header.identity.AccountResourceRefVO;
-import org.zstack.header.identity.AccountResourceRefVO_;
+import org.zstack.header.identity.OwnedByAccount;
 import org.zstack.header.vo.ResourceVO;
-import org.zstack.core.db.Q;
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
-import org.zstack.header.identity.OwnedByAccount;
+
 import javax.persistence.EntityManager;
+import java.util.function.Function;
 
 public aspect OwnedByAccountAspect {
     private static final CLogger logger = Utils.getLogger(OwnedByAccountAspect.class);
 
-    Object around(OwnedByAccount oa) : this(oa) && execution(String OwnedByAccount+.getAccountUuid()) {
+    private static Function<String, String> accountUuidGetter;
+
+    public static Function<String, String> getAccountUuidGetter() {
+        return accountUuidGetter;
+    }
+
+    public static void setAccountUuidGetter(Function<String, String> accountUuidGetter) {
+        OwnedByAccountAspect.accountUuidGetter = accountUuidGetter;
+    }
+
+    Object around(OwnedByAccount oa) : this(oa) && execution(java.lang.String OwnedByAccount+.getAccountUuid()) {
         Object accountUuid = proceed(oa);
 
         if (accountUuid == null) {
-            accountUuid = Q.New(AccountResourceRefVO.class).select(AccountResourceRefVO_.accountUuid)
-                .eq(AccountResourceRefVO_.resourceUuid, ((ResourceVO)oa).getUuid()).findValue();
-            oa.setAccountUuid((String)accountUuid);
+            accountUuid = accountUuidGetter.apply(((ResourceVO) oa).getUuid());
         }
 
         return accountUuid;

…e/aspect/OwnedByAccountAspectHelper.java …r/aspect/OwnedByAccountAspectHelper.javacore/src/main/java/org/zstack/core/aspect/OwnedByAccountAspectHelper.java renamed to header/src/main/java/org/zstack/header/aspect/OwnedByAccountAspectHelper.java core/src/main/java/org/zstack/core/aspect/OwnedByAccountAspectHelper.java renamed to header/src/main/java/org/zstack/header/aspect/OwnedByAccountAspectHelper.java

@@ -1,4 +1,4 @@
-package org.zstack.core.aspect;
+package org.zstack.header.aspect;
 
 import org.zstack.header.identity.AccountConstant;
 import org.zstack.header.identity.AccountResourceRefVO;

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

@@ -33,8 +33,8 @@
 import org.zstack.header.image.ImageInventory;
 import org.zstack.header.image.ImagePlatform;
 import org.zstack.header.image.ImageVO;
-import org.zstack.header.message.*;
 import org.zstack.header.message.APIDeleteMessage.DeletionMode;
+import org.zstack.header.message.*;
 import org.zstack.header.storage.primary.*;
 import org.zstack.header.storage.snapshot.*;
 import org.zstack.header.storage.snapshot.group.MemorySnapshotGroupExtensionPoint;
@@ -786,6 +786,7 @@ private void expunge(final Completion completion) {
         }
 
         final VolumeInventory inv = getSelfInventory();
+        String accountUuid = self.getAccountUuid();
         pluginRgty.getExtensionList(VolumeBeforeExpungeExtensionPoint.class).forEach(ext -> ext.volumePreExpunge(inv));
         FlowChain chain = FlowChainBuilder.newShareFlowChain();
         chain.setName("expunge-volume");
@@ -873,7 +874,6 @@ public void handle(Map data) {
                 CollectionUtils.safeForEach(pluginRgty.getExtensionList(VolumeAfterExpungeExtensionPoint.class), arg -> arg.volumeAfterExpunge(inv));
 
                 VolumeInventory volumeInventory = getSelfInventory();
-                String accountUuid = acntMgr.getOwnerAccountUuidOfResource(self.getUuid());
                 dbf.remove(self);
                 cleanupVolumeEO(self.getUuid());
                 completion.success();
@@ -1205,12 +1205,12 @@ public void rollback(FlowRollback trigger, Map data) {
                     @Override
                     public void handle(Map data) {
                         VolumeStatus oldStatus = self.getStatus();
+                        String accountUuid = self.getAccountUuid();
 
                         if (deletionPolicy == VolumeDeletionPolicy.Direct) {
                             callVmJustBeforeDeleteFromDbExtensionPoint();
                             self.setStatus(VolumeStatus.Deleted);
                             self = dbf.updateAndRefresh(self);
-                            String accountUuid = acntMgr.getOwnerAccountUuidOfResource(self.getUuid());
                             VolumeInventory volumeInventory = getSelfInventory();
                             dbf.remove(self);
                             cleanupVolumeEO(self.getUuid());
@@ -1227,7 +1227,6 @@ public void handle(Map data) {
                             callVmJustBeforeDeleteFromDbExtensionPoint();
                             VolumeInventory inventory = getSelfInventory();
                             inventory.setStatus(VolumeStatus.Deleted.toString());
-                            String accountUuid = acntMgr.getOwnerAccountUuidOfResource(self.getUuid());
                             dbf.remove(self);
                             new FireVolumeCanonicalEvent().fireVolumeStatusChangedEvent(oldStatus, inventory, accountUuid);
                         } else {
@@ -1419,7 +1418,7 @@ public void run(final SyncTaskChain chain) {
                     if (deletionPolicy == VolumeDeletionPolicy.DBOnly) {
                         callVmJustBeforeDeleteFromDbExtensionPoint();
                         VolumeInventory inventory = getSelfInventory();
-                        String accountUuid = acntMgr.getOwnerAccountUuidOfResource(self.getUuid());
+                        String accountUuid = self.getAccountUuid();
                         dbf.remove(self);
                         new FireVolumeCanonicalEvent().fireVolumeStatusChangedEvent(self.getStatus(), inventory, accountUuid);
                     }