Merge branch 'feature-export-image-md5sum@@2' into 'master'

gitlab · gitlab · commit 45b03bb906da · 2020-03-13T23:52:50.000+08:00
[Feature: export image md5sum]

See merge request zstackio/zstack!5991
diff --git a/conf/db/upgrade/V3.9.0__schema.sql b/conf/db/upgrade/V3.9.0__schema.sql
@@ -9,4 +9,11 @@ DROP TABLE DahoVllsVO;
 DROP TABLE DahoConnectionVO;
 DROP TABLE DahoDCAccessVO;
 
-SET FOREIGN_KEY_CHECKS = 1;
+SET FOREIGN_KEY_CHECKS = 1;
+
+ALTER TABLE ImageBackupStorageRefVO ADD COLUMN exportMd5Sum VARCHAR(255) DEFAULT NULL;
+ALTER TABLE ImageBackupStorageRefVO ADD COLUMN exportUrl VARCHAR(2048) DEFAULT NULL;
+UPDATE ImageBackupStorageRefVO ibs, ImageVO i SET ibs.exportMd5Sum = i.exportMd5Sum, ibs.exportUrl = i.exportUrl WHERE ibs.imageUuid = i.uuid;
+DROP VIEW IF EXISTS `zstack`.`ImageVO`;
+CREATE VIEW `zstack`.`ImageVO` AS SELECT uuid, name, description, status, state, size, actualSize, md5Sum, platform, type, format, url, system, mediaType, createDate, lastOpDate, guestOsType FROM `zstack`.`ImageEO` WHERE deleted IS NULL;
+ALTER TABLE ImageEO DROP exportMd5Sum, DROP exportUrl;
diff --git a/core/src/main/java/org/zstack/core/trash/StorageRecycleImpl.java b/core/src/main/java/org/zstack/core/trash/StorageRecycleImpl.java
@@ -95,7 +95,8 @@ private InstallPathRecycleInventory createRecycleFromImage(TrashType type, boole
         vo.setInstallPath(image.getUrl());
         vo.setResourceType(ImageVO.class.getSimpleName());
         vo.setResourceUuid(image.getUuid());
-        vo.setStorageUuid(image.getExportUrl());
+        //the description field temporarily records the uuid value of image storage
+        vo.setStorageUuid(image.getDescription());
         vo.setStorageType(BackupStorageVO.class.getSimpleName());
         vo.setTrashType(type.toString());
         vo.setSize(image.getSize());
diff --git a/header/src/main/java/org/zstack/header/image/ImageAO.java b/header/src/main/java/org/zstack/header/image/ImageAO.java
@@ -17,9 +17,6 @@ public class ImageAO extends ResourceVO implements ShadowEntity {
     @Column
     private String description;
 
-    @Column
-    private String exportUrl;
-
     @Column
     @Enumerated(EnumType.STRING)
     private ImageStatus status;
@@ -39,9 +36,6 @@ public class ImageAO extends ResourceVO implements ShadowEntity {
     @Column
     private String md5Sum;
 
-    @Column
-    private String exportMd5Sum;
-
     @Column
     @Enumerated(EnumType.STRING)
     private ImagePlatform platform;
@@ -119,14 +113,6 @@ public String getDescription() {
         return description;
     }
 
-    public String getExportUrl() {
-        return exportUrl;
-    }
-
-    public void setExportUrl(String exportUrl) {
-        this.exportUrl = exportUrl;
-    }
-
     public void setDescription(String description) {
         this.description = description;
     }
@@ -155,14 +141,6 @@ public void setMd5Sum(String md5Sum) {
         this.md5Sum = md5Sum;
     }
 
-    public String getExportMd5Sum() {
-        return exportMd5Sum;
-    }
-
-    public void setExportMd5Sum(String exportMd5Sum) {
-        this.exportMd5Sum = exportMd5Sum;
-    }
-
     public String getUrl() {
         return url;
     }
diff --git a/header/src/main/java/org/zstack/header/image/ImageAO_.java b/header/src/main/java/org/zstack/header/image/ImageAO_.java
@@ -16,7 +16,6 @@ public class ImageAO_ extends ResourceVO_ {
     public static volatile SingularAttribute<ImageAO, Long> size;
     public static volatile SingularAttribute<ImageAO, Long> actualSize;
     public static volatile SingularAttribute<ImageAO, String> md5Sum;
-    public static volatile SingularAttribute<ImageAO, String> exportMd5Sum;
     public static volatile SingularAttribute<ImageAO, String> type;
     public static volatile SingularAttribute<ImageAO, String> url;
     public static volatile SingularAttribute<ImageAO, Boolean> system;
@@ -27,6 +26,5 @@ public class ImageAO_ extends ResourceVO_ {
     public static volatile SingularAttribute<ImageAO, String> hypervisorType;
     public static volatile SingularAttribute<ImageAO, String> format;
     public static volatile SingularAttribute<ImageAO, String> guestOsType;
-    public static volatile SingularAttribute<ImageAO, String> exportUrl;
     public static volatile SingularAttribute<ImageAO, String> backupStorageUuid;
 }
diff --git a/header/src/main/java/org/zstack/header/image/ImageBackupStorageRefInventory.java b/header/src/main/java/org/zstack/header/image/ImageBackupStorageRefInventory.java
@@ -28,6 +28,8 @@ public class ImageBackupStorageRefInventory implements Serializable {
     private String backupStorageUuid;
     private String installPath;
     private String status;
+    private String exportMd5Sum;
+    private String exportUrl;
     private Timestamp createDate;
     private Timestamp lastOpDate;
 
@@ -40,6 +42,8 @@ public static ImageBackupStorageRefInventory valueOf(ImageBackupStorageRefVO vo)
         inv.setLastOpDate(vo.getLastOpDate());
         inv.setId(vo.getId());
         inv.setStatus(vo.getStatus().toString());
+        inv.setExportMd5Sum(vo.getExportMd5Sum());
+        inv.setExportUrl(vo.getExportUrl());
         return inv;
     }
 
@@ -91,6 +95,22 @@ public void setInstallPath(String installPath) {
         this.installPath = installPath;
     }
 
+    public String getExportMd5Sum() {
+        return exportMd5Sum;
+    }
+
+    public void setExportMd5Sum(String exportMd5Sum) {
+        this.exportMd5Sum = exportMd5Sum;
+    }
+
+    public String getExportUrl() {
+        return exportUrl;
+    }
+
+    public void setExportUrl(String exportUrl) {
+        this.exportUrl = exportUrl;
+    }
+
     public Timestamp getCreateDate() {
         return createDate;
     }
diff --git a/header/src/main/java/org/zstack/header/image/ImageBackupStorageRefInventoryDoc_zh_cn.groovy b/header/src/main/java/org/zstack/header/image/ImageBackupStorageRefInventoryDoc_zh_cn.groovy
@@ -25,6 +25,18 @@ doc {
 		type "String"
 		since "0.6"
 	}
+	field {
+		name "exportUrl"
+		desc ""
+		type "String"
+		since "0.6"
+	}
+	field {
+		name "exportMd5Sum"
+		desc ""
+		type "String"
+		since "0.6"
+	}
 	field {
 		name "status"
 		desc ""
diff --git a/header/src/main/java/org/zstack/header/image/ImageBackupStorageRefVO.java b/header/src/main/java/org/zstack/header/image/ImageBackupStorageRefVO.java
@@ -45,6 +45,10 @@ public class ImageBackupStorageRefVO implements Serializable {
     @Column
     private String installPath;
     @Column
+    private String exportMd5Sum;
+    @Column
+    private String exportUrl;
+    @Column
     private Timestamp createDate;
     @Column
     private Timestamp lastOpDate;
@@ -89,6 +93,22 @@ public void setInstallPath(String installPath) {
         this.installPath = installPath;
     }
 
+    public String getExportMd5Sum() {
+        return exportMd5Sum;
+    }
+
+    public void setExportMd5Sum(String exportMd5Sum) {
+        this.exportMd5Sum = exportMd5Sum;
+    }
+
+    public String getExportUrl() {
+        return exportUrl;
+    }
+
+    public void setExportUrl(String exportUrl) {
+        this.exportUrl = exportUrl;
+    }
+
     public Timestamp getCreateDate() {
         return createDate;
     }
diff --git a/header/src/main/java/org/zstack/header/image/ImageBackupStorageRefVO_.java b/header/src/main/java/org/zstack/header/image/ImageBackupStorageRefVO_.java
@@ -13,6 +13,8 @@ public class ImageBackupStorageRefVO_ {
     public static volatile SingularAttribute<ImageBackupStorageRefVO, String> backupStorageUuid;
     public static volatile SingularAttribute<ImageBackupStorageRefVO, String> installPath;
     public static volatile SingularAttribute<ImageBackupStorageRefVO, ImageStatus> status;
+    public static volatile SingularAttribute<ImageBackupStorageRefVO, String> exportMd5Sum;
+    public static volatile SingularAttribute<ImageBackupStorageRefVO, String> exportUrl;
     public static volatile SingularAttribute<ImageBackupStorageRefVO, Timestamp> createDate;
     public static volatile SingularAttribute<ImageBackupStorageRefVO, Timestamp> lastOpDate;
 }
diff --git a/header/src/main/java/org/zstack/header/image/ImageInventory.java b/header/src/main/java/org/zstack/header/image/ImageInventory.java
@@ -28,8 +28,6 @@ public class ImageInventory implements Serializable {
     private String uuid;
     private String name;
     private String description;
-    private String exportUrl;
-    private String exportMd5Sum;
     private String state;
     private String status;
     private Long size;
@@ -53,8 +51,6 @@ public static ImageInventory valueOf(ImageVO vo) {
         ImageInventory inv = new ImageInventory();
         inv.setCreateDate(vo.getCreateDate());
         inv.setDescription(vo.getDescription());
-        inv.setExportUrl(vo.getExportUrl());
-        inv.setExportMd5Sum(vo.getExportMd5Sum());
         inv.setMediaType(vo.getMediaType().toString());
         inv.setFormat(vo.getFormat());
         inv.setGuestOsType(vo.getGuestOsType());
@@ -78,8 +74,6 @@ public static ImageInventory valueOf(ImageEO vo) {
         ImageInventory inv = new ImageInventory();
         inv.setCreateDate(vo.getCreateDate());
         inv.setDescription(vo.getDescription());
-        inv.setExportUrl(vo.getExportUrl());
-        inv.setExportMd5Sum(vo.getExportMd5Sum());
         inv.setMediaType(vo.getMediaType().toString());
         inv.setPlatform(vo.getPlatform().toString());
         inv.setFormat(vo.getFormat());
@@ -178,22 +172,6 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public String getExportUrl() {
-        return exportUrl;
-    }
-
-    public void setExportUrl(String exportUrl) {
-        this.exportUrl = exportUrl;
-    }
-
-    public String getExportMd5Sum() {
-        return exportMd5Sum;
-    }
-
-    public void setExportMd5Sum(String exportMd5Sum) {
-        this.exportMd5Sum = exportMd5Sum;
-    }
-
     public String getState() {
         return state;
     }
diff --git a/header/src/main/java/org/zstack/header/image/ImageInventoryDoc_zh_cn.groovy b/header/src/main/java/org/zstack/header/image/ImageInventoryDoc_zh_cn.groovy
@@ -29,18 +29,6 @@ doc {
 		type "String"
 		since "0.6"
 	}
-	field {
-		name "exportUrl"
-		desc ""
-		type "String"
-		since "0.6"
-	}
-	field {
-		name "exportMd5Sum"
-		desc ""
-		type "String"
-		since "0.6"
-	}
 	field {
 		name "state"
 		desc ""
diff --git a/header/src/main/java/org/zstack/header/image/ImageStoreMetadataHelper.java b/header/src/main/java/org/zstack/header/image/ImageStoreMetadataHelper.java
@@ -0,0 +1,42 @@
+package org.zstack.header.image;
+
+import org.apache.commons.lang.StringUtils;
+import org.zstack.utils.gson.JSONObjectUtil;
+
+/**
+ * author:kaicai.hu
+ * Date:2020/2/19
+ */
+public class ImageStoreMetadataHelper {
+    private String exportMd5Sum;
+    private String exportUrl;
+
+    public String getExportMd5Sum() {
+        return exportMd5Sum;
+    }
+
+    public void setExportMd5Sum(String exportMd5Sum) {
+        this.exportMd5Sum = exportMd5Sum;
+    }
+
+    public String getExportUrl() {
+        return exportUrl;
+    }
+
+    public void setExportUrl(String exportUrl) {
+        this.exportUrl = exportUrl;
+    }
+
+    public static ImageInventory valueOf(String metadata) {
+        ImageInventory imageInventory = JSONObjectUtil.toObject(metadata, ImageInventory.class);
+        ImageStoreMetadataHelper imageStoreMetadataHelper = JSONObjectUtil.toObject(metadata, ImageStoreMetadataHelper.class);
+        if (StringUtils.isNotEmpty(imageStoreMetadataHelper.getExportMd5Sum())) {
+            imageInventory.getBackupStorageRefs().forEach(ref -> ref.setExportMd5Sum(imageStoreMetadataHelper.getExportMd5Sum()));
+        }
+        if (StringUtils.isNotEmpty(imageStoreMetadataHelper.getExportUrl())) {
+            imageInventory.getBackupStorageRefs().forEach(ref -> ref.setExportUrl(imageStoreMetadataHelper.getExportUrl()));
+        }
+
+        return imageInventory;
+    }
+}
diff --git a/header/src/main/java/org/zstack/header/storage/backup/APIExportImageFromBackupStorageEvent.java b/header/src/main/java/org/zstack/header/storage/backup/APIExportImageFromBackupStorageEvent.java
@@ -12,6 +12,9 @@ public APIExportImageFromBackupStorageEvent(String apiId) {
         super(apiId);
     }
 
+    private String imageUrl;
+    private String exportMd5Sum;
+
     public String getImageUrl() {
         return imageUrl;
     }
@@ -20,13 +23,18 @@ public void setImageUrl(String imageUrl) {
         this.imageUrl = imageUrl;
     }
 
-    private String imageUrl;
- 
+    public String getExportMd5Sum() {
+        return exportMd5Sum;
+    }
+
+    public void setExportMd5Sum(String exportMd5Sum) {
+        this.exportMd5Sum = exportMd5Sum;
+    }
+
     public static APIExportImageFromBackupStorageEvent __example__() {
         APIExportImageFromBackupStorageEvent event = new APIExportImageFromBackupStorageEvent();
-
         event.setImageUrl("http://bs-host-name/path/to/image.qcow2");
-
+        event.setExportMd5Sum("8a239d17b045dea51c4677fa90a42ed8");
         return event;
     }
 
diff --git a/header/src/main/java/org/zstack/header/storage/backup/APIExportImageFromBackupStorageEventDoc_zh_cn.groovy b/header/src/main/java/org/zstack/header/storage/backup/APIExportImageFromBackupStorageEventDoc_zh_cn.groovy
@@ -20,6 +20,12 @@ doc {
 		type "String"
 		since "1.7"
 	}
+	field {
+		name "exportMd5Sum"
+		desc "被导出镜像的md5值"
+		type "String"
+		since "3.9"
+	}
 	field {
 		name "success"
 		desc "导出成功失败标志"
diff --git a/plugin/ceph/src/main/java/org/zstack/storage/ceph/backup/CephBackupStorageMetaDataMaker.java b/plugin/ceph/src/main/java/org/zstack/storage/ceph/backup/CephBackupStorageMetaDataMaker.java
@@ -122,12 +122,14 @@ protected  void restoreImagesBackupStorageMetadataToDatabase(String imagesMetada
                     continue;
                 }
 
-                for ( ImageBackupStorageRefInventory ref : imageInventory.getBackupStorageRefs()) {
+                for (ImageBackupStorageRefInventory ref : imageInventory.getBackupStorageRefs()) {
                     ImageBackupStorageRefVO backupStorageRefVO = new ImageBackupStorageRefVO();
                     backupStorageRefVO.setStatus(ImageStatus.valueOf(ref.getStatus()));
                     backupStorageRefVO.setInstallPath(ref.getInstallPath());
                     backupStorageRefVO.setImageUuid(ref.getImageUuid());
                     backupStorageRefVO.setBackupStorageUuid(backupStorageUuid);
+                    backupStorageRefVO.setExportMd5Sum(ref.getExportMd5Sum());
+                    backupStorageRefVO.setExportUrl(ref.getExportUrl());
                     backupStorageRefVO.setCreateDate(ref.getCreateDate());
                     backupStorageRefVO.setLastOpDate(ref.getLastOpDate());
                     backupStorageRefVOs.add(backupStorageRefVO);
@@ -148,8 +150,6 @@ protected  void restoreImagesBackupStorageMetadataToDatabase(String imagesMetada
                 imageVO.setActualSize(imageInventory.getActualSize());
                 imageVO.setDescription(imageInventory.getDescription());
                 imageVO.setStatus(ImageStatus.valueOf(imageInventory.getStatus()));
-                imageVO.setExportUrl(imageInventory.getExportUrl());
-                imageVO.setExportMd5Sum(imageInventory.getExportMd5Sum());
                 imageVO.setFormat(imageInventory.getFormat());
                 imageVO.setGuestOsType(imageInventory.getGuestOsType());
                 imageVO.setMd5Sum(imageInventory.getMd5Sum());
diff --git a/plugin/sftpBackupStorage/src/main/java/org/zstack/storage/backup/sftp/SftpBackupStorageMetaDataMaker.java b/plugin/sftpBackupStorage/src/main/java/org/zstack/storage/backup/sftp/SftpBackupStorageMetaDataMaker.java
@@ -136,6 +136,8 @@ private void restoreImagesBackupStorageMetadataToDatabase(String imagesMetadata,
                     backupStorageRefVO.setInstallPath(ref.getInstallPath());
                     backupStorageRefVO.setImageUuid(ref.getImageUuid());
                     backupStorageRefVO.setBackupStorageUuid(backupStorageUuid);
+                    backupStorageRefVO.setExportMd5Sum(ref.getExportMd5Sum());
+                    backupStorageRefVO.setExportUrl(ref.getExportUrl());
                     backupStorageRefVO.setCreateDate(ref.getCreateDate());
                     backupStorageRefVO.setLastOpDate(ref.getLastOpDate());
                     backupStorageRefVOs.add(backupStorageRefVO);
@@ -157,8 +159,6 @@ private void restoreImagesBackupStorageMetadataToDatabase(String imagesMetadata,
                 imageVO.setActualSize(imageInventory.getActualSize());
                 imageVO.setDescription(imageInventory.getDescription());
                 imageVO.setStatus(ImageStatus.valueOf(imageInventory.getStatus()));
-                imageVO.setExportUrl(imageInventory.getExportUrl());
-                imageVO.setExportMd5Sum(imageInventory.getExportMd5Sum());
                 imageVO.setFormat(imageInventory.getFormat());
                 imageVO.setGuestOsType(imageInventory.getGuestOsType());
                 imageVO.setMd5Sum(imageInventory.getMd5Sum());
diff --git a/sdk/src/main/java/org/zstack/sdk/ExportImageFromBackupStorageResult.java b/sdk/src/main/java/org/zstack/sdk/ExportImageFromBackupStorageResult.java
diff --git a/sdk/src/main/java/org/zstack/sdk/ImageBackupStorageRefInventory.java b/sdk/src/main/java/org/zstack/sdk/ImageBackupStorageRefInventory.java
diff --git a/sdk/src/main/java/org/zstack/sdk/ImageInventory.java b/sdk/src/main/java/org/zstack/sdk/ImageInventory.java
diff --git a/test/src/test/groovy/org/zstack/test/integration/core/trash/BackupStorageTrashCase.groovy b/test/src/test/groovy/org/zstack/test/integration/core/trash/BackupStorageTrashCase.groovy

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ public class ImageBackupStorageRefVO_ {`
`13`	`13`	`public static volatile SingularAttribute<ImageBackupStorageRefVO, String> backupStorageUuid;`
`14`	`14`	`public static volatile SingularAttribute<ImageBackupStorageRefVO, String> installPath;`
`15`	`15`	`public static volatile SingularAttribute<ImageBackupStorageRefVO, ImageStatus> status;`
	`16`	`+ public static volatile SingularAttribute<ImageBackupStorageRefVO, String> exportMd5Sum;`
	`17`	`+ public static volatile SingularAttribute<ImageBackupStorageRefVO, String> exportUrl;`
`16`	`18`	`public static volatile SingularAttribute<ImageBackupStorageRefVO, Timestamp> createDate;`
`17`	`19`	`public static volatile SingularAttribute<ImageBackupStorageRefVO, Timestamp> lastOpDate;`
`18`	`20`	`}`