Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(frontend): redis集群容量变更调整 #5659 #6843

Merged
merged 1 commit into from
Sep 11, 2024
Merged

feat(frontend): redis集群容量变更调整 #5659 #6843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions dbm-ui/frontend/src/services/model/ticket/details/redis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@ export interface RedisScaleUpDownDetails extends DetailBase {
affinity: 'CROS_SUBZONE';
};
};
display_info?: {
new_group_num: number;
};
}[];
specs: DetailSpecs;
}
Expand Down
3 changes: 1 addition & 2 deletions .../frontend/src/views/redis/capacity-change/pages/page1/components/RenderTargetCapacity.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
}
return Promise.resolve({
shard_num: localValue.value.cluster_shard_num, // props.rowData!.shardNum
group_num: targetObj.value!.requireMachineGroupNum,
group_num: localValue.value.machine_pair, // targetObj.value!.requireMachineGroupNum,
capacity: futureCapacity.value ?? 1,
future_capacity: futureCapacity.value ?? 1,
update_mode: targetObj.value?.updateMode,
Expand All @@ -226,7 +226,6 @@
affinity: AffinityType.CROS_SUBZONE, // 暂时固定 'CROS_SUBZONE',
},
},
new_group_num: localValue.value.machine_pair,
});
},
});
Expand Down
5 changes: 0 additions & 5 deletions dbm-ui/frontend/src/views/redis/capacity-change/pages/page1/components/Row.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,17 +191,12 @@
targetCapacityRef.value!.getValue(),
]).then((data) => {
const [version, switchMode, targetCapacity] = data;
const displayInfo = {
new_group_num: targetCapacity.new_group_num,
};
delete targetCapacity.new_group_num;
return {
cluster_id: props.data.clusterId,
db_version: version,
bk_cloud_id: props.data.bkCloudId,
online_switch_type: switchMode,
...targetCapacity,
display_info: displayInfo,
};
});
},
Expand Down
4 changes: 2 additions & 2 deletions ...ontend/src/views/tickets/common/components/demand-factory/redis/ClusterCapacityUpdate.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
{
title: t('机器组数'),
render: () => {
const targetValue = data?.display_info?.new_group_num || 0
const targetValue = data.shard_num
return (
<>
<span>{targetValue}</span>
Expand All @@ -201,7 +201,7 @@
{
title: t('机器数量'),
render: () => {
const targetValue = (data?.display_info?.new_group_num || 0) * 2
const targetValue = data.shard_num * 2
return (
<>
<span>{targetValue}</span>
Expand Down
Loading