From 575a0c28449464b388f13e6f47ee175e5215f082 Mon Sep 17 00:00:00 2001
From: iSecloud <869820505@qq.com>
Date: Fri, 3 Nov 2023 10:41:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(backend):=20=E4=BF=AE=E6=94=B9redis?=
 =?UTF-8?q?=E5=AE=B9=E9=87=8F=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95=20#1652?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbm-ui/backend/db_meta/models/spec.py                | 2 +-
 dbm-ui/backend/db_services/dbresource/serializers.py | 2 +-
 dbm-ui/frontend/src/types/auto-imports.d.ts          | 2 +-
 helm-charts/bk-dbm/Chart.yaml                        | 4 ++--
 helm-charts/bk-dbm/charts/dbm/Chart.yaml             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dbm-ui/backend/db_meta/models/spec.py b/dbm-ui/backend/db_meta/models/spec.py
index 3b675b8001..49fb13d784 100644
--- a/dbm-ui/backend/db_meta/models/spec.py
+++ b/dbm-ui/backend/db_meta/models/spec.py
@@ -69,7 +69,7 @@ def capacity(self):
             ClusterType.TwemproxyTendisSSDInstance,
             ClusterType.TendisPredixyTendisplusCluster,
         ]:
-            return mount_point__size["/data1"]
+            return mount_point__size.get("/data1") or mount_point__size["/data"] / 2
 
         if self.spec_cluster_type == ClusterType.TendisTwemproxyRedisInstance:
             # 取min, max都一样
diff --git a/dbm-ui/backend/db_services/dbresource/serializers.py b/dbm-ui/backend/db_services/dbresource/serializers.py
index f103feb220..789bf502ba 100644
--- a/dbm-ui/backend/db_services/dbresource/serializers.py
+++ b/dbm-ui/backend/db_services/dbresource/serializers.py
@@ -272,7 +272,7 @@ def validate_data_points(self, attrs):
                 raise serializers.ValidationError(
                     _("【{}】后端磁盘挂载点必须包含/data，可选/data1").format(attrs["spec_cluster_type"])
                 )
-        # TendisPlus/TendisSSD 磁盘必须包含/data和/data1
+        # TendisPlus/TendisSSD 磁盘必须包含/data，/data1可选
         if (
             attrs["spec_cluster_type"]
             in [
diff --git a/dbm-ui/frontend/src/types/auto-imports.d.ts b/dbm-ui/frontend/src/types/auto-imports.d.ts
index 108a98378a..ff488e388a 100644
--- a/dbm-ui/frontend/src/types/auto-imports.d.ts
+++ b/dbm-ui/frontend/src/types/auto-imports.d.ts
@@ -66,5 +66,5 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode } from 'vue'
 }
diff --git a/helm-charts/bk-dbm/Chart.yaml b/helm-charts/bk-dbm/Chart.yaml
index f5c3f10822..a7f448504d 100644
--- a/helm-charts/bk-dbm/Chart.yaml
+++ b/helm-charts/bk-dbm/Chart.yaml
@@ -79,5 +79,5 @@ dependencies:
 description: A Helm chart for bkdbm
 name: bk-dbm
 type: application
-version: 1.2.0-alpha.76
-appVersion: 1.2.0-alpha.76
+version: 1.2.0-alpha.77
+appVersion: 1.2.0-alpha.77
diff --git a/helm-charts/bk-dbm/charts/dbm/Chart.yaml b/helm-charts/bk-dbm/charts/dbm/Chart.yaml
index 1994047bd8..9808f6469f 100644
--- a/helm-charts/bk-dbm/charts/dbm/Chart.yaml
+++ b/helm-charts/bk-dbm/charts/dbm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.2.0-alpha.443
+appVersion: 1.2.0-alpha.444
 description: A Helm chart for dbm
 name: dbm
 type: application