Skip to content

Commit f670f28

Browse files
authored
Merge pull request #591 from tapdata/feat/TAP-11870-Rebalance
Feat/tap 11870 rebalance
2 parents 820d218 + ba9d760 commit f670f28

15 files changed

Lines changed: 3195 additions & 832 deletions

File tree

apps/daas/src/i18n/langs/en.js

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,6 +2251,7 @@ export default {
22512251
daas_role_role_gongnengquanxian: 'Function Permission',
22522252
daas_role_role_yemianquanxian: 'Page Permission',
22532253
daas_role_role_gongnengmokuai: 'Function Module',
2254+
daas_role_role_no_matching_module: 'No matching modules',
22542255
daas_role_role_gouxuanxiangyingmo:
22552256
'Check the corresponding module to indicate that the navigation is visible to users under the current role, and enable [View All Data] to indicate that the role can view and operate all the data under this module, and if it is not checked, it can only view and operate the data created and authorized by itself data. ',
22562257
daas_feature_unavailable: 'Restricted Feature',
@@ -2280,6 +2281,76 @@ export default {
22802281
daas_cluster_engine_hostname: 'Hostname/IP',
22812282
daas_cluster_connection_count: 'TCP Connection Count',
22822283
daas_cluser_keyword_placeholder: 'Search for hostnames',
2284+
daas_task_rebalance_button: 'Task Rebalance',
2285+
daas_task_rebalance_title: 'Task Rebalance Plan',
2286+
daas_task_rebalance_subtitle:
2287+
'Drag task cards onto a target engine to adjust the task distribution across engines',
2288+
daas_task_rebalance_online: 'Online',
2289+
daas_task_rebalance_offline: 'Offline',
2290+
daas_task_rebalance_memory: 'Memory Usage',
2291+
daas_task_rebalance_task_count: 'Tasks',
2292+
daas_task_rebalance_legend_move: 'Tasks to be moved',
2293+
daas_task_rebalance_legend_locked: 'Tasks that cannot be rebalanced',
2294+
daas_task_rebalance_cancel: 'Cancel',
2295+
daas_task_rebalance_confirm: 'Confirm Rebalance',
2296+
daas_task_rebalance_create: 'Create Rebalance',
2297+
daas_task_rebalance_empty: 'No tasks available for rebalancing',
2298+
daas_task_rebalance_create_success: 'Rebalance plan created, migration started',
2299+
daas_task_rebalance_type_initial_sync: 'Full',
2300+
daas_task_rebalance_type_cdc: 'Incremental',
2301+
daas_task_rebalance_type_full_cdc: 'Full + Incremental',
2302+
daas_task_rebalance_reason_only_one_agent:
2303+
'At least two available engines are required',
2304+
daas_task_rebalance_reason_agent_offline: 'The current engine is offline',
2305+
daas_task_rebalance_reason_status_error:
2306+
'The task is not running and cannot be migrated',
2307+
daas_task_rebalance_reason_manual_agent:
2308+
'A fixed engine is specified and cannot be migrated',
2309+
daas_task_rebalance_reason_incremental:
2310+
'Initial sync in progress, cannot be migrated',
2311+
daas_task_rebalance_history_title: 'Task Rebalance Records',
2312+
daas_task_rebalance_history_list_title: 'History',
2313+
daas_task_rebalance_history_empty: 'No rebalance records',
2314+
daas_task_rebalance_history_empty_desc:
2315+
'Records will appear here after a rebalance',
2316+
daas_task_rebalance_history_detail_empty: 'Select a record on the left',
2317+
daas_task_rebalance_history_task_total: '{count} tasks',
2318+
daas_task_rebalance_history_record_creating: 'Creating',
2319+
daas_task_rebalance_history_record_running: 'Running',
2320+
daas_task_rebalance_history_record_done: 'Completed',
2321+
daas_task_rebalance_history_record_partial: 'Partially Completed',
2322+
daas_task_rebalance_history_record_cancelled: 'Cancelled',
2323+
daas_task_rebalance_history_record_failed: 'Failed',
2324+
daas_task_rebalance_history_job_pending: 'Pending',
2325+
daas_task_rebalance_history_job_starting: 'Starting',
2326+
daas_task_rebalance_history_job_stopping: 'Stopping',
2327+
daas_task_rebalance_history_job_ok: 'Completed',
2328+
daas_task_rebalance_history_job_cancelled: 'Cancelled',
2329+
daas_task_rebalance_history_job_invalid_agent: 'Invalid Agent',
2330+
daas_task_rebalance_history_job_status_error: 'Status Error',
2331+
daas_task_rebalance_history_job_stop_timeout: 'Stop Timeout',
2332+
daas_task_rebalance_history_job_start_timeout: 'Start Timeout',
2333+
daas_task_rebalance_history_job_failed: 'Failed',
2334+
daas_task_rebalance_history_stat_success: 'Success',
2335+
daas_task_rebalance_history_stat_failed: 'Failed',
2336+
daas_task_rebalance_history_stat_skipped: 'Skipped',
2337+
daas_task_rebalance_history_stat_running: 'Running',
2338+
daas_task_rebalance_history_stat_pending: 'Pending',
2339+
daas_task_rebalance_history_col_task: 'Task Name',
2340+
daas_task_rebalance_history_col_source: 'Source Engine',
2341+
daas_task_rebalance_history_col_target: 'Target Engine',
2342+
daas_task_rebalance_history_col_status: 'Status',
2343+
daas_task_rebalance_history_col_error: 'Error',
2344+
daas_task_rebalance_history_col_action: 'Action',
2345+
daas_task_rebalance_history_cancel: 'Cancel',
2346+
daas_task_rebalance_history_cancel_remaining: 'Cancel Remaining',
2347+
daas_task_rebalance_history_cancel_remaining_confirm:
2348+
'Cancel the remaining {count} pending tasks? This cannot be undone.',
2349+
daas_task_rebalance_history_cancel_success: 'Task cancelled',
2350+
daas_task_rebalance_history_cancel_remaining_success:
2351+
'{count} tasks cancelled',
2352+
daas_task_rebalance_history_progress: 'Execution Progress',
2353+
page_title_task_rebalance: 'Task Rebalance',
22832354

22842355
webhook_alerts: 'Webhook Alerts',
22852356
webhook_alerts_detail: 'Webhook Alert Details',

apps/daas/src/i18n/langs/zh-CN.js

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2134,6 +2134,7 @@ export default {
21342134
daas_role_role_gongnengmokuai: '功能模块',
21352135
daas_role_role_gouxuanxiangyingmo:
21362136
'勾选相应模块表示此导航对当前角色下用户可见,开启【查看全部数据】则表示角色可以查看和操作该模块下所有的数据,不勾选则只能查看和操作自己创建和被授权的数据。',
2137+
daas_role_role_no_matching_module: '没有匹配的模块',
21372138

21382139
daas_feature_unavailable: '升级版本,解锁更多功能!',
21392140
daas_feature_unavailable_subtitle:
@@ -2160,6 +2161,69 @@ export default {
21602161
daas_cluster_engine_hostname: '主机名/IP',
21612162
daas_cluster_connection_count: 'TCP 连接数',
21622163
daas_cluser_keyword_placeholder: '搜索主机名',
2164+
daas_task_rebalance_button: '任务调度均衡',
2165+
daas_task_rebalance_title: '任务均衡方案',
2166+
daas_task_rebalance_subtitle: '拖动任务卡片到目标引擎,调整各引擎的任务分布',
2167+
daas_task_rebalance_online: '在线',
2168+
daas_task_rebalance_offline: '离线',
2169+
daas_task_rebalance_memory: '内存使用率',
2170+
daas_task_rebalance_task_count: '任务数',
2171+
daas_task_rebalance_legend_move: '将被调走的任务',
2172+
daas_task_rebalance_legend_locked: '不可均衡的任务',
2173+
daas_task_rebalance_cancel: '取消',
2174+
daas_task_rebalance_confirm: '确认均衡',
2175+
daas_task_rebalance_create: '创建均衡',
2176+
daas_task_rebalance_empty: '暂无可均衡的任务',
2177+
daas_task_rebalance_create_success: '均衡方案已创建,开始执行任务迁移',
2178+
daas_task_rebalance_type_initial_sync: '全量',
2179+
daas_task_rebalance_type_cdc: '增量',
2180+
daas_task_rebalance_type_full_cdc: '全量+增量',
2181+
daas_task_rebalance_reason_only_one_agent: '可用引擎不足 2 个,无法均衡',
2182+
daas_task_rebalance_reason_agent_offline: '当前引擎已离线',
2183+
daas_task_rebalance_reason_status_error: '任务非运行中,无法迁移',
2184+
daas_task_rebalance_reason_manual_agent: '已指定固定引擎,无法迁移',
2185+
daas_task_rebalance_reason_incremental: '全量同步中,无法迁移',
2186+
daas_task_rebalance_history_title: '任务均衡记录',
2187+
daas_task_rebalance_history_list_title: '历史记录',
2188+
daas_task_rebalance_history_empty: '暂无均衡记录',
2189+
daas_task_rebalance_history_empty_desc: '任务均衡后记录将显示在这里',
2190+
daas_task_rebalance_history_detail_empty: '请在左侧选择一条记录',
2191+
daas_task_rebalance_history_task_total: '{count} 个任务',
2192+
daas_task_rebalance_history_record_creating: '创建中',
2193+
daas_task_rebalance_history_record_running: '执行中',
2194+
daas_task_rebalance_history_record_done: '已完成',
2195+
daas_task_rebalance_history_record_partial: '部分完成',
2196+
daas_task_rebalance_history_record_cancelled: '已取消',
2197+
daas_task_rebalance_history_record_failed: '失败',
2198+
daas_task_rebalance_history_job_pending: '等待中',
2199+
daas_task_rebalance_history_job_starting: '启动中',
2200+
daas_task_rebalance_history_job_stopping: '停止中',
2201+
daas_task_rebalance_history_job_ok: '已完成',
2202+
daas_task_rebalance_history_job_cancelled: '已取消',
2203+
daas_task_rebalance_history_job_invalid_agent: '引擎不可用',
2204+
daas_task_rebalance_history_job_status_error: '状态异常',
2205+
daas_task_rebalance_history_job_stop_timeout: '停止超时',
2206+
daas_task_rebalance_history_job_start_timeout: '启动超时',
2207+
daas_task_rebalance_history_job_failed: '失败',
2208+
daas_task_rebalance_history_stat_success: '成功',
2209+
daas_task_rebalance_history_stat_failed: '失败',
2210+
daas_task_rebalance_history_stat_skipped: '跳过',
2211+
daas_task_rebalance_history_stat_running: '运行中',
2212+
daas_task_rebalance_history_stat_pending: '等待中',
2213+
daas_task_rebalance_history_col_task: '任务名称',
2214+
daas_task_rebalance_history_col_source: '源引擎',
2215+
daas_task_rebalance_history_col_target: '目标引擎',
2216+
daas_task_rebalance_history_col_status: '状态',
2217+
daas_task_rebalance_history_col_error: '错误原因',
2218+
daas_task_rebalance_history_col_action: '操作',
2219+
daas_task_rebalance_history_cancel: '取消',
2220+
daas_task_rebalance_history_cancel_remaining: '取消剩余任务',
2221+
daas_task_rebalance_history_cancel_remaining_confirm:
2222+
'确定取消剩余 {count} 个等待中的任务吗?此操作不可撤销。',
2223+
daas_task_rebalance_history_cancel_success: '任务已取消',
2224+
daas_task_rebalance_history_cancel_remaining_success: '已取消 {count} 个任务',
2225+
daas_task_rebalance_history_progress: '执行进度',
2226+
page_title_task_rebalance: '任务均衡',
21632227

21642228
webhook_alerts: 'Webhook 告警',
21652229
webhook_alerts_detail: 'Webhook 告警详情',

apps/daas/src/i18n/langs/zh-TW.js

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2118,6 +2118,7 @@ export default {
21182118
daas_role_role_gongnengquanxian: '功能權限',
21192119
daas_role_role_yemianquanxian: '頁面權限',
21202120
daas_role_role_gongnengmokuai: '功能模塊',
2121+
daas_role_role_no_matching_module: '沒有匹配的模塊',
21212122
daas_role_role_gouxuanxiangyingmo:
21222123
'勾選相應模塊表示此導航對當前角色下用戶可見,開啟【查看全部數據】則表示角色可以查看和操作該模塊下所有的數據,不勾選則只能查看和操作自己創建和被授權的數據。 ',
21232124
daas_feature_unavailable: '功能暫不可用',
@@ -2145,6 +2146,69 @@ export default {
21452146
daas_cluster_engine_hostname: '主機名/IP',
21462147
daas_cluster_connection_count: 'TCP 連接數',
21472148
daas_cluser_keyword_placeholder: '搜索主機名',
2149+
daas_task_rebalance_button: '任務調度均衡',
2150+
daas_task_rebalance_title: '任務均衡方案',
2151+
daas_task_rebalance_subtitle: '拖動任務卡片到目標引擎,調整各引擎的任務分佈',
2152+
daas_task_rebalance_online: '在線',
2153+
daas_task_rebalance_offline: '離線',
2154+
daas_task_rebalance_memory: '內存使用率',
2155+
daas_task_rebalance_task_count: '任務數',
2156+
daas_task_rebalance_legend_move: '將被調走的任務',
2157+
daas_task_rebalance_legend_locked: '不可均衡的任務',
2158+
daas_task_rebalance_cancel: '取消',
2159+
daas_task_rebalance_confirm: '確認均衡',
2160+
daas_task_rebalance_create: '創建均衡',
2161+
daas_task_rebalance_empty: '暫無可均衡的任務',
2162+
daas_task_rebalance_create_success: '均衡方案已創建,開始執行任務遷移',
2163+
daas_task_rebalance_type_initial_sync: '全量',
2164+
daas_task_rebalance_type_cdc: '增量',
2165+
daas_task_rebalance_type_full_cdc: '全量+增量',
2166+
daas_task_rebalance_reason_only_one_agent: '可用引擎不足 2 個,無法均衡',
2167+
daas_task_rebalance_reason_agent_offline: '當前引擎已離線',
2168+
daas_task_rebalance_reason_status_error: '任務非運行中,無法遷移',
2169+
daas_task_rebalance_reason_manual_agent: '已指定固定引擎,無法遷移',
2170+
daas_task_rebalance_reason_incremental: '全量同步中,無法遷移',
2171+
daas_task_rebalance_history_title: '任務均衡記錄',
2172+
daas_task_rebalance_history_list_title: '歷史記錄',
2173+
daas_task_rebalance_history_empty: '暫無均衡記錄',
2174+
daas_task_rebalance_history_empty_desc: '任務均衡後記錄將顯示在這裡',
2175+
daas_task_rebalance_history_detail_empty: '請在左側選擇一條記錄',
2176+
daas_task_rebalance_history_task_total: '{count} 個任務',
2177+
daas_task_rebalance_history_record_creating: '創建中',
2178+
daas_task_rebalance_history_record_running: '執行中',
2179+
daas_task_rebalance_history_record_done: '已完成',
2180+
daas_task_rebalance_history_record_partial: '部分完成',
2181+
daas_task_rebalance_history_record_cancelled: '已取消',
2182+
daas_task_rebalance_history_record_failed: '失敗',
2183+
daas_task_rebalance_history_job_pending: '等待中',
2184+
daas_task_rebalance_history_job_starting: '啟動中',
2185+
daas_task_rebalance_history_job_stopping: '停止中',
2186+
daas_task_rebalance_history_job_ok: '已完成',
2187+
daas_task_rebalance_history_job_cancelled: '已取消',
2188+
daas_task_rebalance_history_job_invalid_agent: '引擎不可用',
2189+
daas_task_rebalance_history_job_status_error: '狀態異常',
2190+
daas_task_rebalance_history_job_stop_timeout: '停止超時',
2191+
daas_task_rebalance_history_job_start_timeout: '啟動超時',
2192+
daas_task_rebalance_history_job_failed: '失敗',
2193+
daas_task_rebalance_history_stat_success: '成功',
2194+
daas_task_rebalance_history_stat_failed: '失敗',
2195+
daas_task_rebalance_history_stat_skipped: '跳過',
2196+
daas_task_rebalance_history_stat_running: '運行中',
2197+
daas_task_rebalance_history_stat_pending: '等待中',
2198+
daas_task_rebalance_history_col_task: '任務名稱',
2199+
daas_task_rebalance_history_col_source: '源引擎',
2200+
daas_task_rebalance_history_col_target: '目標引擎',
2201+
daas_task_rebalance_history_col_status: '狀態',
2202+
daas_task_rebalance_history_col_error: '錯誤原因',
2203+
daas_task_rebalance_history_col_action: '操作',
2204+
daas_task_rebalance_history_cancel: '取消',
2205+
daas_task_rebalance_history_cancel_remaining: '取消剩餘任務',
2206+
daas_task_rebalance_history_cancel_remaining_confirm:
2207+
'確定取消剩餘 {count} 個等待中的任務嗎?此操作不可撤銷。',
2208+
daas_task_rebalance_history_cancel_success: '任務已取消',
2209+
daas_task_rebalance_history_cancel_remaining_success: '已取消 {count} 個任務',
2210+
daas_task_rebalance_history_progress: '執行進度',
2211+
page_title_task_rebalance: '任務均衡',
21482212

21492213
webhook_alerts: 'Webhook 告警',
21502214
webhook_alerts_detail: 'Webhook 告警詳情',

apps/daas/src/router/menu.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ export const MENU = [
8383
{ name: 'dataEncryption' },
8484
{ name: 'projectManagement' },
8585
{ name: 'dataImportExport' },
86+
{
87+
name: 'taskRebalanceHistory',
88+
parent: 'taskRebalance',
89+
code: 'v2_task_rebalance',
90+
},
8691
],
8792
},
8893
{

apps/daas/src/router/routes.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,29 @@ export const routes = [
482482
},
483483
],
484484
},
485+
/* ---------- 任务均衡 ----------*/
486+
{
487+
path: '/task-rebalance',
488+
name: 'taskRebalance',
489+
component: Layout,
490+
redirect: {
491+
name: 'taskRebalanceHistory',
492+
},
493+
meta: {
494+
title: 'page_title_task_rebalance',
495+
},
496+
children: [
497+
{
498+
path: '',
499+
name: 'taskRebalanceHistory',
500+
component: () => import('@/views/task-rebalance/History.vue'),
501+
meta: {
502+
hideTitle: true,
503+
title: 'page_title_task_rebalance',
504+
},
505+
},
506+
],
507+
},
485508
/* ---------- 函数管理 ----------*/
486509
{
487510
path: '/function',

0 commit comments

Comments
 (0)