Skip to content

feat: add task type to ID generation for Standard and PersistentCache tasks #4065

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

Merged
merged 1 commit into from
May 14, 2025
Merged

feat: add task type to ID generation for Standard and PersistentCache tasks #4065

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
4 changes: 2 additions & 2 deletions .github/workflows/compatibility-e2e-v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ jobs:
skip: "Rate Limit | preheat files in cache"
- module: client
image: client
image-tag: v0.2.26
image-tag: v0.2.28
chart-name: client
skip: "Rate Limit"
- module: seed-client
image: client
image-tag: v0.2.26
image-tag: v0.2.28
chart-name: seed-client
skip: "Rate Limit"

Expand Down
2 changes: 1 addition & 1 deletion client-rs
Open in desktop
Submodule client-rs updated 5 files
+8 −8 Cargo.lock
+8 −8 Cargo.toml
+14 −10 dragonfly-client-util/src/id_generator/mod.rs
+6 −6 dragonfly-client/src/resource/persistent_cache_task.rs
+38 −35 dragonfly-client/src/resource/task.rs
2 changes: 2 additions & 0 deletions pkg/idgen/task_id.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"strings"

commonv1 "d7y.io/api/v2/pkg/apis/common/v1"
commonv2 "d7y.io/api/v2/pkg/apis/common/v2"

pkgdigest "d7y.io/dragonfly/v2/pkg/digest"
neturl "d7y.io/dragonfly/v2/pkg/net/url"
Expand Down Expand Up @@ -103,6 +104,7 @@ func TaskIDV2ByURLBased(url string, pieceLength *uint64, tag, application string
params = append(params, strconv.FormatUint(*pieceLength, 10))
}

params = append(params, commonv2.TaskType_STANDARD.String())
return pkgdigest.SHA256FromStrings(params...)
}

Expand Down
12 changes: 6 additions & 6 deletions pkg/idgen/task_id_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func TestTaskIDV2ByURLBased(t *testing.T) {
filters: []string{},
expect: func(t *testing.T, d any) {
assert := assert.New(t)
assert.Equal(d, "99a47b38e9d3321aebebd715bea0483c1400cef2f767f84d97458f9dcedff221")
assert.Equal(d, "27554d06dfc788c2c2c60e01960152ffbd4b145fc103fcb80b432b4dc238a6fe")
},
},
{
Expand All @@ -137,7 +137,7 @@ func TestTaskIDV2ByURLBased(t *testing.T) {
application: "bar",
expect: func(t *testing.T, d any) {
assert := assert.New(t)
assert.Equal(d, "160fa7f001d9d2e893130894fbb60a5fb006e1d61bff82955f2946582bc9de1d")
assert.Equal(d, "06408fbf247ddaca478f8cb9565fe5591c28efd0994b8fea80a6a87d3203c5ca")
},
},
{
Expand All @@ -146,7 +146,7 @@ func TestTaskIDV2ByURLBased(t *testing.T) {
tag: "foo",
expect: func(t *testing.T, d any) {
assert := assert.New(t)
assert.Equal(d, "2773851c628744fb7933003195db436ce397c1722920696c4274ff804d86920b")
assert.Equal(d, "3c3f230ef9f191dd2821510346a7bc138e4894bee9aee184ba250a3040701d2a")
},
},
{
Expand All @@ -155,7 +155,7 @@ func TestTaskIDV2ByURLBased(t *testing.T) {
application: "bar",
expect: func(t *testing.T, d any) {
assert := assert.New(t)
assert.Equal(d, "63dee2822037636b0109876b58e95692233840753a882afa69b9b5ee82a6c57d")
assert.Equal(d, "c9f9261b7305c24371244f9f149f5d4589ed601348fdf22d7f6f4b10658fdba2")
},
},
{
Expand All @@ -164,7 +164,7 @@ func TestTaskIDV2ByURLBased(t *testing.T) {
pieceLength: &pieceLength,
expect: func(t *testing.T, d any) {
assert := assert.New(t)
assert.Equal(d, "40c21de3ad2f1470ca1a19a2ad2577803a1829851f6cf862ffa2d4577ae51d38")
assert.Equal(d, "9f7c9aafbc6f30f8f41a96ca77eeae80c5b60964b3034b0ee43ccf7b2f9e52b8")
},
},
{
Expand All @@ -173,7 +173,7 @@ func TestTaskIDV2ByURLBased(t *testing.T) {
filters: []string{"foo", "bar"},
expect: func(t *testing.T, d any) {
assert := assert.New(t)
assert.Equal(d, "100680ad546ce6a577f42f52df33b4cfdca756859e664b8d7de329b150d09ce9")
assert.Equal(d, "457b4328cde278e422c9e243f7bfd1e97f511fec43a80f535cf6b0ef6b086776")
},
},
}
Expand Down
40 changes: 18 additions & 22 deletions test/e2e/v2/containerd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,23 @@ var _ = Describe("Containerd with CRI support", func() {

taskMetadatas := []util.TaskMetadata{
{
ID: "f6da796ed137cd53c9759b634aa80e2b93b5c66f7dc23db016d739d63496a430",
ID: "1f047bc5cd298700f1190641992556c3958ad3bf389105dedd537e7913b3f8dc",
Sha256: "ca51217de9012bffe54390f1a91365af22a06279a3f2b3e57d4d2dc99b989588",
},
{
ID: "9176125ce8d7b67276d077ab15af1a5809080f02f16efce2a3d2c4fce600bedd",
ID: "77e5c810d83f5be37314b512ab4acd78341e923c50d4da47c9e1199abfd8da9f",
Sha256: "0d816dfc0753b877a04e3df93557bd3597fc7d0e308726655b14401c22a3b92a",
},
{
ID: "f5d1cbede9a750c5f3014d8aefef5f57a12ee4ee8d48e6201d19d42a69226b2c",
ID: "562184a74d7dc841ce714921d394a95d540534bd8518b20ea0f2bac9ab040694",
Sha256: "b5941d5a445040d3a792e5be361ca42989d97fc30ff53031f3004ccea8e44520",
},
{
ID: "17d49b1b992fde658d1abfce6bae5877f48de760aba17cf573bd0e40e6a15001",
Sha256: "c1d6d1b2d5a367259e6e51a7f4d1ccd66a28cc9940d6599d8a8ea9544dd4b4a8",
},
{
ID: "d68cb057073fb4eff2989e9110e7127d6812415db223a6658e8e71f3686b8acb",
ID: "ca428437ad023f7f6e1174d95b1d352d3c834846a0f1de5ae8dce5cf3d4f5aa5",
Sha256: "2a1bc4e0f20bb5ed9a2197ecffde7eace4a9b9179048614205d025df73ba97c7",
},
{
ID: "5ad1cd4c767450ad216b95bc438d4c228f0945cd247fb43f737ae9beac6fba4b",
ID: "53a25c54374bec29c3b0f313f421ae5d139b27ed3b51bfe1fbfeaa86a08937b5",
Sha256: "078ea4eebc352a499d7bb6ff65fab1325226e524acac89a9db922ad91cab88f1",
},
}
Expand Down Expand Up @@ -98,19 +94,19 @@ var _ = Describe("Containerd with CRI support", func() {

taskMetadatas := []util.TaskMetadata{
{
ID: "6f55276e68f872fba78843019fd12a8461a14ccf4ac375057680123d3e4d8cbe",
ID: "fd68f82ea453803d0e9fb2976f5f034e0ab90d6aa5856b1adc40039212d92aa8",
Sha256: "0f4277a6444fbaf4eb5a7f39103e281dd57969953c7425edc7c8d4aa419347eb",
},
{
ID: "83b91ece0ebe89274fd99aed64fd4257bccde245e8da0fbbcdf7c4da8d5533de",
ID: "785f97d679062050a12d0489104f13a3e8fe68922e17b95aaed6249d0b983ab9",
Sha256: "e55b67c1d5660c34dcb0d8e6923d0a50695a4f0d94f858353069bae17d0bfdea",
},
{
ID: "6b6a238a08ddaed6594284cff238cdaf0cd0364570023e4731eefca3aa27a002",
ID: "04f978cb5d8062dfccf0e70774c05c8f2c95ee385b3349fe6efbb6d2b15c6d02",
Sha256: "8572bc8fb8a32061648dd183b2c0451c82be1bd053a4ea8fae991436b92faebb",
},
{
ID: "8e373a2dbd9a733585db5478a0d15bab88ec3d4c60f0ce064ef4d7453c97a05f",
ID: "95c7239527dd27df223708d2fa4a9ca2d764d44341ebe4dab600d346502058be",
Sha256: "88bfc12bad0cc91b2d47de4c7a755f6547b750256cc4c8b284e07aae13e4e041",
},
}
Expand Down Expand Up @@ -154,27 +150,27 @@ var _ = Describe("Containerd with CRI support", func() {

taskMetadatas := []util.TaskMetadata{
{
ID: "eae30e4f11c1f9e46305de15d560f161eca4339358684150bbc6b3636242fa08",
ID: "4977d204abab1b21a677daf2f705934caa7f5f21c364a7625ad230c933b41e72",
Sha256: "c8071d0de0f5bb17fde217dafdc9d2813ce9db77e60f6233bcd32f1c8888b121",
},
{
ID: "fc4538dc3b9f25e601a59302e6edcf7cb9eaf97c4ecda5fd3f600de736e3e5dd",
ID: "cd9e68218c4f69d8b71cec3e9d9342b9665088994dd2049e733a430aaf564d8b",
Sha256: "e964513726885fa2f977425fc889eabbe25c9fa47e7a4b0ec5e2baef96290f47",
},
{
ID: "53cc7eb8cfe8f396d7dcaa25163bdd65720e4ac5d39a70d8a595abde26b86f22",
ID: "94ad52f16ab43c874ab6a0a6480aefe34970139e9c444472fbb01d76b0ec5bda",
Sha256: "0e304933d7eae4674e05b3bc409f236c65077e2b7055119bbd66ff613fe5e1ad",
},
{
ID: "8961dce0ceecdf7eeace18af8c9e5404b279b5cd541f9220c42e049c738d00b9",
ID: "a294e4746f268f08345c522c03e86e3c787b22ff27c2de8cabffd52d14080226",
Sha256: "53b01ef3d5d676a8514ded6b469932e33d84738e5e00932ca124382a8567c44b",
},
{
ID: "829047ff8b3ef37c68764e73ad50dfbf3e657419fa6bf1b373c46ad5dfc48768",
ID: "0036c704a45de385e36c7752e4a3496e9f3f50c37ac5cc4ce737d57aceb3eb12",
Sha256: "c9d959fc168ad8bdc9a021066eb9c1dd4de8e860c03619a88d8ba0ff5479d9ea",
},
{
ID: "7f784cfc82e45628e6cd35fae45b61a0e9ce66b772542f03d650534a34a8297c",
ID: "efcea01bf4082b7425e027a436e6a284d6e46860e053e673678758a906f28660",
Sha256: "b6acfae843b58bf14369ebbeafa96af5352cde9a89f8255ca51f92b233a6e405",
},
}
Expand Down Expand Up @@ -218,15 +214,15 @@ var _ = Describe("Containerd with CRI support", func() {

taskMetadatas := []util.TaskMetadata{
{
ID: "ec17104ac49cf85fced3652f854e09b0cf0948fb232b136e3f57be3f9aeb77b2",
ID: "0721e454cdc3cf4a6285b8f44638387af69475cc76dcf81b9cd4ae618268b921",
Sha256: "c58d97dd21c3b3121f262a1fbb5a278f77ab85dba7a02b819e710f34683cf746",
},
{
ID: "2453086dcc76db72d09a710be96625d53a41c78747fd56c6ea1f2f340691b731",
ID: "fcae534b9d18697437c096c9442a1800e427a7d8aed80de335a93bef42d881de",
Sha256: "2ff0ae26fa61a2b0f88f470a8e50f7623ea48b224eb072a5878a20d663d5307d",
},
{
ID: "4f89c2f02c36714b19cde131a654babc558c261abb6ee2c94ff54b5fcd4c8daf",
ID: "1ce41bca3caca3d74f262b6e2fbccca6629714f6a31c26fe5c3fe941566b7777",
Sha256: "b1826117441e607acd3b98c93cdb16759c2cc2240852055b8a2b5860f3204f1e",
},
}
Expand Down
22 changes: 11 additions & 11 deletions test/e2e/v2/manager/preheat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,11 +337,11 @@ var _ = Describe("Preheat with Manager", func() {

taskMetadatas := []util.TaskMetadata{
{
ID: "50f91088cd60a49bf565396c1f7ba1f8b9d32c9f1541d2e06b085c780030805a",
ID: "a5040eb77de7f771cb3ce3ecb2ebb61af124d3341e0b5c6854b7e220eb0dc680",
Sha256: "a711f05d33845e2e9deffcfcc5adf082d7c6e97e3e3a881d193d9aae38f092a8",
},
{
ID: "a048c8c66a652030fba31514735ff51288c54f72f878e363948303ded065e199",
ID: "f9f24ea0c08c3637d2d5770fbf80a201f69482226de7cf4490bb1c540ac51b37",
Sha256: "f643e116a03d9604c344edb345d7592c48cc00f2a4848aaf773411f4fb30d2f5",
},
}
Expand Down Expand Up @@ -391,19 +391,19 @@ var _ = Describe("Preheat with Manager", func() {

taskMetadatas := []util.TaskMetadata{
{
ID: "1a2cf94649557d3e978f355bcc8eaffadd4c8d41e334fc93adc3ea49488d1200",
ID: "d4d951a403de1bffc916f99da4c2240a9d059ebb77d3a72f9aff717fc79ecdc1",
Sha256: "f1f1039835051ecc04909f939530e86a20f02d2ce5ad7a81c0fa3616f7303944",
},
{
ID: "ba71de48fb521ec52a4dff60106af10512eb21a40b8fd1756467af19592e6a74",
ID: "7de709bb37831ab4765124d9ba99e4875292eb64316dbf1a35ddc9fb93bd1f34",
Sha256: "871ab018db94b4ae7b137764837bc4504393a60656ba187189e985cd809064f7",
},
{
ID: "3cf396cec1d067374714655cf98f5e505626d1b6cdec094b1469b3c98569e3d1",
ID: "978cf50feb0176010e9a06fdad59b70527ec113b8c9f55ec0c90e662778711d2",
Sha256: "f1a1d290795d904815786e41d39a41dc1af5de68a9e9020baba8bd83b32d8f95",
},
{
ID: "b04072342af19c13fcda146a71727edd03442d9851ca185d297f53442ba12a22",
ID: "ce58246d09c169d4c1aa8d8c6bf759cfeed9f7641488888610685e19a75fab56",
Sha256: "f1ffc4b5459e82dc8e7ddd1d1a2ec469e85a1f076090c22851a1f2ce6f71e1a6",
},
}
Expand Down Expand Up @@ -451,23 +451,23 @@ var _ = Describe("Preheat with Manager", func() {

taskMetadatas := []util.TaskMetadata{
{
ID: "d83d909b2ec5660323a4225149fb87886f9897cf6098ffcb108a77ac252facaf",
ID: "37f5bbbbf666734f24617784b63f74ecffedf963f8d0d69c09263040833ccd35",
Sha256: "9986a736f7d3d24bb01b0a560fa0f19c4b57e56c646e1f998941529d28710e6b",
},
{
ID: "0eb92ed9ea3561063efceaf414e2a5431410d5ba76523bb2e0a4793fdf9a38b1",
ID: "51b0632572673b3ebd4dfa03e0eed7e6d87a40761e21136d12facb6708704e9a",
Sha256: "f7307687fd72fb79eadd7f38f8cb9675b76480e32365a5d282a06f788944e9f2",
},
{
ID: "45e6cddeb6d117e61312e3913779b88e3ac8c37f8df2f0814bf2d8cda6f784d7",
ID: "bef8903b7dd6e0a8a332d588e18050b5a957dd65b168b50550fddace6edc09e0",
Sha256: "fc5951fb196d09e569f4592b50e3a71ad01d11da229b8a500fea278eba0170c5",
},
{
ID: "e1ab22f7ff59940064e2ffde854fe3e0fcd23267268ff382696875c49844c985",
ID: "0f5a6501cc568be92877beec44a0f1c57416b06599921ab264dac41b0bb06af2",
Sha256: "c7c72808bf776cd122bdaf4630a4a35ea319603d6a3b6cbffddd4c7fd6d2d269",
},
{
ID: "56ee9d6d3bcac9e6543073e175ba2a0ee5d37c27d6e1a7daabeea44b7fbdd4a4",
ID: "f84cee1df2c7219fe589903cfff6f9ad71a518f64966a91a3063366dd9b4e063",
Sha256: "edbf1aa1d62d9c17605c1ee2d9dff43489bc0f8ae056367734386c35bfae226a",
},
}
Expand Down