Merge branch 'for-3.9-release@@3' into 'master'

Prepare for 3.9.0 release

See merge request zstackio/zstack!5929

Author: gitlab

VERSION

@@ -1,3 +1,3 @@
 MAJOR=3
-MINOR=8
+MINOR=9
 UPDATE=0

build/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>zstack</artifactId>
         <groupId>org.zstack</groupId>
-        <version>3.8.0</version>
+        <version>3.9.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>build</artifactId>

compute/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>zstack</artifactId>
         <groupId>org.zstack</groupId>
-        <version>3.8.0</version>
+        <version>3.9.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>compute</artifactId>

compute/src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java

@@ -370,7 +370,7 @@ private void getInterdependentImagesByL3NetworkUuids(APIGetInterdependentL3Netwo
                     bq.setParameter("types", hostAllocatorMgr.getBackupStorageTypesByPrimaryStorageTypeFromMetrics(ps.getType()));
                     lst.addAll(bq.getResultList());
                 } else if (!bsUuids.isEmpty()) {
-                    // the primary storage has bound backup storage, e.g. ceph, fusionstor
+                    // the primary storage has bound backup storage, e.g. ceph
                     sql = "select bs from BackupStorageVO bs where bs.uuid in (:uuids)";
                     TypedQuery<BackupStorageVO> bq = dbf.getEntityManager().createQuery(sql, BackupStorageVO.class);
                     bq.setParameter("uuids", bsUuids);
@@ -457,7 +457,7 @@ private void getInterdependentL3NetworksByImageUuid(APIGetInterdependentL3Networ
                 l3q.setParameter("zoneUuid", msg.getZoneUuid());
                 l3s.addAll(l3q.getResultList());
             } else if (!relatedPrimaryStorageUuids.isEmpty()) {
-                // the backup storage has strongly-bound primary storage, e.g. ceph, fusionstor
+                // the backup storage has strongly-bound primary storage, e.g. ceph
                 sql = "select l3" +
                         " from L3NetworkVO l3, L2NetworkClusterRefVO l2ref," +
                         " PrimaryStorageClusterRefVO psref, PrimaryStorageVO ps" +

conf/db/upgrade/V3.9.0__schema.sql

@@ -17453,227 +17453,6 @@
     "line": 2055,
     "fileName": "src/main/java/org/zstack/storage/device/StorageDeviceManagerImpl.java"
   },
-  {
-    "raw": "invalid monUrl[%s]. A valid url is in format of %s",
-    "en_US": "invalid monUrl[{0}]. A valid url is in format of {1}",
-    "zh_CN": "非法的monUrl[{0}]. 格式为{1}的非法url",
-    "arguments": [
-      "monUrl",
-      "MON_URL_FORMAT"
-    ],
-    "line": 103,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/FusionstorApiInterceptor.java"
-  },
-  {
-    "raw": "dataVolumePoolName can be null but cannot be an empty string",
-    "en_US": "dataVolumePoolName can be null but cannot be an empty string",
-    "zh_CN": "数据盘池名可以为空但是不能为一个空字符串",
-    "arguments": [],
-    "line": 112,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/FusionstorApiInterceptor.java"
-  },
-  {
-    "raw": "rootVolumePoolName can be null but cannot be an empty string",
-    "en_US": "rootVolumePoolName can be null but cannot be an empty string",
-    "zh_CN": "根数据盘池名可以为空但是不能为一个空字符串",
-    "arguments": [],
-    "line": 117,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/FusionstorApiInterceptor.java"
-  },
-  {
-    "raw": "imageCachePoolName can be null but cannot be an empty string",
-    "en_US": "imageCachePoolName can be null but cannot be an empty string",
-    "zh_CN": "镜像缓存池名可以为空但是不能为空字符串",
-    "arguments": [],
-    "line": 122,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/FusionstorApiInterceptor.java"
-  },
-  {
-    "raw": "poolName can be null but cannot be an empty string",
-    "en_US": "poolName can be null but cannot be an empty string",
-    "zh_CN": "池名可以为空但是不能是空的字符串",
-    "arguments": [],
-    "line": 153,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/FusionstorApiInterceptor.java"
-  },
-  {
-    "raw": "cannot add fusionstor primary storage, there has been some fusionstor primary storage using mon[hostnames:%s]",
-    "en_US": "cannot add fusionstor primary storage, there has been some fusionstor primary storage using mon[hostnames:{0}]",
-    "zh_CN": "",
-    "arguments": [
-      "existing"
-    ],
-    "line": 79,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/FusionstorApiInterceptor.java"
-  },
-  {
-    "raw": "cannot add fusionstor backup storage, there has been some fusionstor backup storage using mon[hostnames:%s]",
-    "en_US": "cannot add fusionstor backup storage, there has been some fusionstor backup storage using mon[hostnames:{0}]",
-    "zh_CN": "",
-    "arguments": [
-      "existing"
-    ],
-    "line": 145,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/FusionstorApiInterceptor.java"
-  },
-  {
-    "raw": "all fusionstor mons are Disconnected in fusionstor backup storage[uuid:%s]",
-    "en_US": "all fusionstor mons are Disconnected in fusionstor backup storage[uuid:{0}]",
-    "zh_CN": "",
-    "arguments": [
-      "self.getUuid()"
-    ],
-    "line": 277,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/backup/FusionstorBackupStorageBase.java"
-  },
-  {
-    "raw": "[mon:%s], %s",
-    "en_US": "[mon:{0}], {1}",
-    "zh_CN": "",
-    "arguments": [
-      "base.getSelf().getHostname()",
-      "ret.error"
-    ],
-    "line": 303,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/backup/FusionstorBackupStorageBase.java"
-  },
-  {
-    "raw": "fusionstor backup storage do not support to cancel download image",
-    "en_US": "fusionstor backup storage do not support to cancel download image",
-    "zh_CN": "",
-    "arguments": [],
-    "line": 387,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/backup/FusionstorBackupStorageBase.java"
-  },
-  {
-    "raw": "unable to connect to the fusionstor backup storage[uuid:%s]. Failed to connect all fusionstor mons. Errors are %s",
-    "en_US": "unable to connect to the fusionstor backup storage[uuid:{0}]. Failed to connect all fusionstor mons. Errors are {1}",
-    "zh_CN": "",
-    "arguments": [
-      "self.getUuid()",
-      "JSONObjectUtil.toJsonString(errorCodes)"
-    ],
-    "line": 542,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/backup/FusionstorBackupStorageBase.java"
-  },
-  {
-    "raw": "there is another Fusionstor backup storage[name:%s, uuid:%s] with the same FSID[%s], you cannot add the same Fusionstor setup as two different backup storage",
-    "en_US": "there is another Fusionstor backup storage[name:{0}, uuid:{1}] with the same FSID[{2}], you cannot add the same Fusionstor setup as two different backup storage",
-    "zh_CN": "",
-    "arguments": [
-      "otherfusion.getName()",
-      "otherfusion.getUuid()",
-      "fsId"
-    ],
-    "line": 630,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/backup/FusionstorBackupStorageBase.java"
-  },
-  {
-    "raw": "the mon[ip:%s] returns a fsid[%s] different from the current fsid[%s] of the cep cluster,are you adding a mon not belonging to current cluster mistakenly?",
-    "en_US": "the mon[ip:{0}] returns a fsid[{1}] different from the current fsid[{2}] of the cep cluster,are you adding a mon not belonging to current cluster mistakenly?",
-    "zh_CN": "mon[ip:{0}]返回了一个fsid[{1}]和当前ceph集群的fsid[{2}]不同，你是否错误地添加了一个不属于当前集群的mon？",
-    "arguments": [
-      "base.getSelf().getHostname()",
-      "fsid",
-      "getSelf().getFsid()"
-    ],
-    "line": 2289,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/primary/FusionstorPrimaryStorageBase.java"
-  },
-  {
-    "raw": "backing up snapshots to backup storage is a depreciated feature, which will be removed in future version",
-    "en_US": "backing up snapshots to backup storage is a depreciated feature, which will be removed in future version",
-    "zh_CN": "备份快照到镜像服务器是一个弃用的功能，将会在未来版本中被移除",
-    "arguments": [],
-    "line": 2437,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/primary/FusionstorPrimaryStorageBase.java"
-  },
-  {
-    "raw": "the backup storage[uuid:%s, name:%s, fsid:%s] is not in the same fusionstor cluster with the primary storage[uuid:%s, name:%s, fsid:%s]",
-    "en_US": "the backup storage[uuid:{0}, name:{1}, fsid:{2}] is not in the same fusionstor cluster with the primary storage[uuid:{3}, name:{4}, fsid:{5}]",
-    "zh_CN": "",
-    "arguments": [
-      "backupStorage.getUuid()",
-      "backupStorage.getName()",
-      "bsFsid",
-      "self.getUuid()",
-      "self.getName()",
-      "getSelf().getFsid()"
-    ],
-    "line": 885,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/primary/FusionstorPrimaryStorageBase.java"
-  },
-  {
-    "raw": "all fusionstor mons of primary storage[uuid:%s] are not in Connected state",
-    "en_US": "all fusionstor mons of primary storage[uuid:{0}] are not in Connected state",
-    "zh_CN": "",
-    "arguments": [
-      "self.getUuid()"
-    ],
-    "line": 1616,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/primary/FusionstorPrimaryStorageBase.java"
-  },
-  {
-    "raw": "fusionstor primary storage[uuid:%s] may have been deleted.",
-    "en_US": "fusionstor primary storage[uuid:{0}] may have been deleted.",
-    "zh_CN": "Fusionstor主存储[uuid:{0}]可能已经被删除",
-    "arguments": [
-      "self.getUuid()"
-    ],
-    "line": 1698,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/primary/FusionstorPrimaryStorageBase.java"
-  },
-  {
-    "raw": "unable to connect to the fusionstor primary storage[uuid:%s]. Failed to connect all fusionstor mons. Errors are %s",
-    "en_US": "unable to connect to the fusionstor primary storage[uuid:{0}]. Failed to connect all fusionstor mons. Errors are {1}",
-    "zh_CN": "",
-    "arguments": [
-      "self.getUuid()",
-      "JSONObjectUtil.toJsonString(errorCodes)"
-    ],
-    "line": 1685,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/primary/FusionstorPrimaryStorageBase.java"
-  },
-  {
-    "raw": "there is another Fusionstor primary storage[name:%s, uuid:%s] with the same FSID[%s], you cannot add the same Fusionstor setup as two different primary storage",
-    "en_US": "there is another Fusionstor primary storage[name:{0}, uuid:{1}] with the same FSID[{2}], you cannot add the same Fusionstor setup as two different primary storage",
-    "zh_CN": "",
-    "arguments": [
-      "otherFusion.getName()",
-      "otherFusion.getUuid()",
-      "fsId"
-    ],
-    "line": 1784,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/primary/FusionstorPrimaryStorageBase.java"
-  },
-  {
-    "raw": "unable to upload bits to the backup storage[type:%s], we only support FUSIONSTOR",
-    "en_US": "unable to upload bits to the backup storage[type:{0}], we only support FUSIONSTOR",
-    "zh_CN": "",
-    "arguments": [
-      "bsType"
-    ],
-    "line": 2394,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/primary/FusionstorPrimaryStorageBase.java"
-  },
-  {
-    "raw": "cannot find any Connected fusionstor mon for the primary storage[uuid:%s]",
-    "en_US": "cannot find any Connected fusionstor mon for the primary storage[uuid:{0}]",
-    "zh_CN": "",
-    "arguments": [
-      "vol.getPrimaryStorageUuid()"
-    ],
-    "line": 293,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/primary/FusionstorPrimaryStorageFactory.java"
-  },
-  {
-    "raw": "this has not been supported by fusionstor",
-    "en_US": "this has not been supported by fusionstor",
-    "zh_CN": "",
-    "arguments": [],
-    "line": 613,
-    "fileName": "src/main/java/org/zstack/storage/fusionstor/primary/FusionstorPrimaryStorageFactory.java"
-  },
   {
     "raw": "No host available for block live migration",
     "en_US": "No host available for block live migration",
@@ -24235,4 +24014,4 @@
     "line": 27,
     "fileName": "src/test/java/org/zstack/test/kvm/KVMPingAgentExtensionForTest.java"
   }
-]
+]