feat(frontend): 单节点原地升级支持跨版本 TencentBlueKing#8697

3octaves · Jan 15, 2025 · fa40c53 · fa40c53
1 parent 05b6bf4
commit fa40c53
Show file tree

Hide file tree

Showing 10 changed files with 592 additions and 16 deletions.
diff --git a/dbm-ui/frontend/src/hooks/useTicketCloneInfo/generateCloneData/mysql/versionLocalUpgrade.ts b/dbm-ui/frontend/src/hooks/useTicketCloneInfo/generateCloneData/mysql/versionLocalUpgrade.ts
@@ -57,7 +57,9 @@ export async function generateMysqlVersionLocalUpgradeCloneData(ticketData: Tick
         moduleId: clusters[clusterId].db_module_id,
         cloudId: clusters[clusterId].bk_cloud_id,
       },
+      targetVersion: item.display_info.target_version,
       targetPackage: item.pkg_id,
+      targetModule: item.new_db_module_id,
     };
   });
 

diff --git a/dbm-ui/frontend/src/services/model/ticket/details/mysql/localUpgrade.ts b/dbm-ui/frontend/src/services/model/ticket/details/mysql/localUpgrade.ts
@@ -5,13 +5,16 @@ export interface LocalUpgrade extends DetailBase {
   infos: {
     pkg_id: number;
     cluster_ids: number[];
+    new_db_module_id?: number; // 单节点集群传递
     display_info: {
       cluster_type: string;
       current_version: string;
       current_package: string;
       target_package: string;
       charset: string;
       current_module_name: string;
+      target_version?: string; // 单节点集群传递
+      target_module_name?: string; // 单节点集群传递
     };
   }[];
   force: boolean;

diff --git a/dbm-ui/frontend/src/services/source/mysqlToolbox.ts b/dbm-ui/frontend/src/services/source/mysqlToolbox.ts
@@ -18,6 +18,7 @@ import http from '@services/http';
 export function queryMysqlHigherVersionPkgList(params: {
   cluster_id: number;
   higher_major_version?: boolean; // 代表是否跨版本升级, 默认false
+  higher_all_version?: boolean; // 单节点本地升级 获取可用的升级包
 }) {
   return http.post<
     {

diff --git a/.../page1/components/RenderTargetVersion.vue → ...orage-layer-local/RenderTargetVersion.vue b/.../page1/components/RenderTargetVersion.vue → ...orage-layer-local/RenderTargetVersion.vue
@@ -108,7 +108,6 @@
   interface Exposes {
     getValue: () => Promise<{
       pkg_id: number;
-      new_db_module_id: number;
       display_info: {
         target_version: string;
         target_package: string;
@@ -128,7 +127,6 @@
   const { t } = useI18n();
 
   const packageSelectRef = ref<InstanceType<typeof TableEditSelect>>();
-  const moduleSelectRef = ref<InstanceType<typeof TableEditSelect>>();
   const localVersion = ref<string>('');
   const localPackage = ref<number | ''>('');
   const localModule = ref<number | ''>('');
@@ -271,9 +269,8 @@
 
   defineExpose<Exposes>({
     getValue() {
-      return Promise.all([packageSelectRef.value!.getValue(), moduleSelectRef.value?.getValue()]).then(() => ({
+      return packageSelectRef.value!.getValue().then(() => ({
         pkg_id: localPackage.value as number,
-        new_db_module_id: localModule.value as number,
         display_info: {
           target_version: localVersion.value,
           target_package: packageSelectList.value.find((item) => item.id === localPackage.value)?.name || '',

diff --git a/...ews/db-manage/mysql/version-upgrade/pages/page1/components/ha-storage-layer-local/Row.vue b/...ews/db-manage/mysql/version-upgrade/pages/page1/components/ha-storage-layer-local/Row.vue
@@ -47,7 +47,8 @@
 
   import RenderCluster from '../RenderClusterWithRelateCluster.vue';
   import RenderCurrentVersion from '../RenderCurrentVersion.vue';
-  import RenderTargetVersion from '../RenderTargetVersion.vue';
+
+  import RenderTargetVersion from './RenderTargetVersion.vue';
 
   export interface IDataRow {
     rowKey: string;

diff --git a/...ql/version-upgrade/pages/page1/components/ha-storage-layer-remote/RenderTargetVersion.vue b/...ql/version-upgrade/pages/page1/components/ha-storage-layer-remote/RenderTargetVersion.vue
@@ -154,7 +154,7 @@
   import { getModules } from '@services/source/cmdb';
   import { queryMysqlHigherVersionPkgList } from '@services/source/mysqlToolbox';
 
-  import { ClusterTypes, TicketTypes } from '@common/const';
+  import { TicketTypes } from '@common/const';
 
   import TableEditSelect, { type IListItem } from '@views/db-manage/mysql/common/edit/Select.vue';
 
@@ -415,10 +415,7 @@
     const url = router.resolve({
       name: 'SelfServiceCreateDbModule',
       params: {
-        type:
-          props.data!.clusterType === ClusterTypes.TENDBSINGLE
-            ? TicketTypes.MYSQL_SINGLE_APPLY
-            : TicketTypes.MYSQL_HA_APPLY,
+        type: TicketTypes.MYSQL_HA_APPLY,
         bk_biz_id: bizId,
       },
       query: {