From 6371a70543c5a594d6a38652a61fb639f0c611cc Mon Sep 17 00:00:00 2001 From: yingxuan Date: Thu, 28 Aug 2025 14:50:12 +0800 Subject: [PATCH 1/2] chore: Modify the persistent cache task API definition Signed-off-by: yingxuan --- .../persistent-cache-task.json | 48 +++++++++---------- src/lib/api.ts | 8 ++-- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cypress/fixtures/resource/persistent-cache-task/persistent-cache-task.json b/cypress/fixtures/resource/persistent-cache-task/persistent-cache-task.json index 74d63bd3..f8386964 100644 --- a/cypress/fixtures/resource/persistent-cache-task/persistent-cache-task.json +++ b/cypress/fixtures/resource/persistent-cache-task/persistent-cache-task.json @@ -70,13 +70,13 @@ "used_percent": 1 }, "network": { - "download_rate": 1000, - "download_rate_limit": 4000, + "rx_bandwidth": 1000, + "max_rx_bandwidth": 4000, "idc": "HangZhou", "location": "HangZhou", "tcp_connection_count": 2, - "upload_rate": 1000, - "upload_rate_limit": 20000, + "tx_bandwidth": 1000, + "max_tx_bandwidth": 20000, "upload_tcp_connection_count": 4 }, "os": "ios", @@ -152,13 +152,13 @@ "used_percent": 1 }, "network": { - "download_rate": 1000, - "download_rate_limit": 4000, + "rx_bandwidth": 1000, + "max_rx_bandwidth": 4000, "idc": "HangZhou", "location": "HangZhou", "tcp_connection_count": 2, - "upload_rate": 1000, - "upload_rate_limit": 20000, + "tx_bandwidth": 1000, + "max_tx_bandwidth": 20000, "upload_tcp_connection_count": 4 }, "os": "ios", @@ -234,13 +234,13 @@ "used_percent": 1 }, "network": { - "download_rate": 1000, - "download_rate_limit": 4000, + "rx_bandwidth": 1000, + "max_rx_bandwidth": 4000, "idc": "HangZhou", "location": "HangZhou", "tcp_connection_count": 2, - "upload_rate": 1000, - "upload_rate_limit": 20000, + "tx_bandwidth": 1000, + "max_tx_bandwidth": 20000, "upload_tcp_connection_count": 4 }, "os": "Linux", @@ -316,13 +316,13 @@ "used_percent": 1 }, "network": { - "download_rate": 1000, - "download_rate_limit": 4000, + "rx_bandwidth": 1000, + "max_rx_bandwidth": 4000, "idc": "HangZhou", "location": "HangZhou", "tcp_connection_count": 2, - "upload_rate": 1000, - "upload_rate_limit": 20000, + "tx_bandwidth": 1000, + "max_tx_bandwidth": 20000, "upload_tcp_connection_count": 4 }, "os": "ios", @@ -398,13 +398,13 @@ "used_percent": 1 }, "network": { - "download_rate": 1000, - "download_rate_limit": 4000, + "rx_bandwidth": 1000, + "max_rx_bandwidth": 4000, "idc": "HangZhou", "location": "HangZhou", "tcp_connection_count": 2, - "upload_rate": 1000, - "upload_rate_limit": 20000, + "tx_bandwidth": 1000, + "max_tx_bandwidth": 20000, "upload_tcp_connection_count": 4 }, "os": "ios", @@ -480,13 +480,13 @@ "used_percent": 1 }, "network": { - "download_rate": 1000, - "download_rate_limit": 4000, + "rx_bandwidth": 1000, + "max_rx_bandwidth": 4000, "idc": "HangZhou", "location": "HangZhou", "tcp_connection_count": 2, - "upload_rate": 1000, - "upload_rate_limit": 20000, + "tx_bandwidth": 1000, + "max_tx_bandwidth": 20000, "upload_tcp_connection_count": 4 }, "os": "ios", diff --git a/src/lib/api.ts b/src/lib/api.ts index 3cdad1f6..4114498b 100644 --- a/src/lib/api.ts +++ b/src/lib/api.ts @@ -1186,13 +1186,13 @@ export interface persistentCacheTasksPeersResponse { used_percent: number; }; network: { - download_rate: number; - download_rate_limit: number; + rx_bandwidth: number; + max_rx_bandwidth: number; idc: string; location: string; tcp_connection_count: number; - upload_rate: number; - upload_rate_limit: number; + tx_bandwidth: number; + max_tx_bandwidth: number; upload_tcp_connection_count: number; }; os: string; From ba6bc8a88e2f5aee45eb12dab62bb1ddca4e3f36 Mon Sep 17 00:00:00 2001 From: yingxuan Date: Fri, 29 Aug 2025 14:55:55 +0800 Subject: [PATCH 2/2] chore: Modify get_image_distribution job parameters Signed-off-by: yingxuan --- .../resource/task/image-manifest-url-task.json | 16 ++++++++-------- src/components/resource/task/clear/index.tsx | 8 ++++---- src/lib/api.ts | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cypress/fixtures/resource/task/image-manifest-url-task.json b/cypress/fixtures/resource/task/image-manifest-url-task.json index 4ee614d4..81ba3bc5 100644 --- a/cypress/fixtures/resource/task/image-manifest-url-task.json +++ b/cypress/fixtures/resource/task/image-manifest-url-task.json @@ -22,7 +22,7 @@ { "ip": "172.18.0.4", "hostname": "kind-worker1", - "layers": [ + "cached_layers": [ { "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1ffc4b5459e82dc8e7ddd1d1a2ec469e85a1f076090c22851a1f2ce6f71e1a6?format=json" }, @@ -38,7 +38,7 @@ { "ip": "172.18.0.4", "hostname": "kind-worker2", - "layers": [ + "cached_layers": [ { "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1f1039835051ecc04909f939530e86a20f02d2ce5ad7a81c0fa3616f7303944" }, @@ -51,7 +51,7 @@ { "ip": "172.18.0.4", "hostname": "kind-worker3", - "layers": [ + "cached_layers": [ { "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1ffc4b5459e82dc8e7ddd1d1a2ec469e85a1f076090c22851a1f2ce6f71e1a6" }, @@ -64,7 +64,7 @@ { "ip": "172.18.0.4", "hostname": "kind-worker4", - "layers": [ + "cached_layers": [ { "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1f1039835051ecc04909f939530e86a20f02d2ce5ad7a81c0fa3616f7303944" }, @@ -77,7 +77,7 @@ { "ip": "172.18.0.4", "hostname": "kind-worker5", - "layers": [ + "cached_layers": [ { "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1ffc4b5459e82dc8e7ddd1d1a2ec469e85a1f076090c22851a1f2ce6f71e1a6" }, @@ -90,7 +90,7 @@ { "ip": "172.18.0.4", "hostname": "kind-worker6", - "layers": [ + "cached_layers": [ { "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1f1039835051ecc04909f939530e86a20f02d2ce5ad7a81c0fa3616f7303944" }, @@ -103,7 +103,7 @@ { "ip": "172.18.0.3", "hostname": "kind-worker7", - "layers": [ + "cached_layers": [ { "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1f1039835051ecc04909f939530e86a20f02d2ce5ad7a81c0fa3616f7303944" }, @@ -116,7 +116,7 @@ { "ip": "172.18.0.3", "hostname": "kind-worker8", - "layers": [ + "cached_layers": [ { "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1f1039835051ecc04909f939530e86a20f02d2ce5ad7a81c0fa3616f7303944" }, diff --git a/src/components/resource/task/clear/index.tsx b/src/components/resource/task/clear/index.tsx index 4d1fea40..aa00a10b 100644 --- a/src/components/resource/task/clear/index.tsx +++ b/src/components/resource/task/clear/index.tsx @@ -90,7 +90,7 @@ type Image = { type OriginalPeer = { ip: string; hostname: string; - layers: Layers[]; + cached_layers: Layers[]; scheduler_cluster_id?: number; }; @@ -117,7 +117,7 @@ const transformImages = (images: createGetImageDistributionJobResponse): Transfo const cleanedPeer = { ip: peer.ip, hostname: peer.hostname, - layers: peer.layers, + cached_layers: peer.cached_layers, }; clusters.get(clusterId)!.push(cleanedPeer); @@ -1478,7 +1478,7 @@ export default function Clear() { fontFamily="mabry-bold" className={styles.bolbProportionText} > - {`${((items?.layers?.length / layer) * 100).toFixed(2) || 0}%`} + {`${((items?.cached_layers?.length / layer) * 100).toFixed(2) || 0}%`} @@ -1500,7 +1500,7 @@ export default function Clear() { - {items?.layers.map((item: any, bolbIndex: any) => ( + {items?.cached_layers.map((item: any, bolbIndex: any) => (