Skip to content

Commit 7ca8930

Browse files
gaius-qigaius-qi
committed
Trigger CI pipeline
Signed-off-by: Gaius <gaius.qi@gmail.com>
1 parent 7b9c3f9 commit 7ca8930

File tree

17 files changed

+83
-304
lines changed

17 files changed

+83
-304
lines changed

‎internal/job/types.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ type PreheatRequest struct {
2727
Headers map[string]string `json:"headers" validate:"omitempty"`
2828
Application string `json:"application" validate:"omitempty"`
2929
Priority int32 `json:"priority" validate:"omitempty"`
30-
PieceLength uint32 `json:"pieceLength" validate:"omitempty"`
3130
}
3231

3332
// PreheatResponse defines the response parameters for preheating.

‎manager/job/preheat.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ func (p *preheat) CreatePreheat(ctx context.Context, schedulers []models.Schedul
109109
URL: json.URL,
110110
Tag: json.Tag,
111111
FilteredQueryParams: json.FilteredQueryParams,
112-
PieceLength: json.PieceLength,
113112
Headers: json.Headers,
114113
},
115114
}
@@ -323,7 +322,6 @@ func (p *preheat) parseLayers(manifests []distribution.Manifest, args types.Preh
323322
URL: image.blobsURL(v.Digest.String()),
324323
Tag: args.Tag,
325324
FilteredQueryParams: args.FilteredQueryParams,
326-
PieceLength: args.PieceLength,
327325
Headers: nethttp.HeaderToMap(header),
328326
}
329327

‎manager/service/job.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ func (s *service) CreatePreheatJob(ctx context.Context, json types.CreatePreheat
3737
return nil, err
3838
}
3939

40-
if json.Args.PieceLength == 0 {
41-
json.Args.PieceLength = types.DefaultPreheatJobPieceLength
42-
}
43-
4440
groupJobState, err := s.job.CreatePreheat(ctx, candidateSchedulers, json.Args)
4541
if err != nil {
4642
return nil, err
@@ -232,12 +228,6 @@ func (s *service) pollingJob(ctx context.Context, id uint, groupID string) {
232228
return nil, false, err
233229
}
234230

235-
fmt.Println("111111111111111111111111111111111111")
236-
fmt.Println("111111111111111111111111111111111111")
237-
fmt.Println(result)
238-
fmt.Println("111111111111111111111111111111111111")
239-
fmt.Println("111111111111111111111111111111111111")
240-
241231
if err := s.db.WithContext(ctx).First(&job, id).Updates(models.Job{
242232
State: groupJob.State,
243233
Result: result,

‎manager/service/preheat.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ func (s *service) CreateV1Preheat(ctx context.Context, json types.CreateV1Prehea
5151
Type: json.Type,
5252
URL: json.URL,
5353
FilteredQueryParams: json.FilteredQueryParams,
54-
PieceLength: types.DefaultPreheatJobPieceLength,
5554
Headers: json.Headers,
5655
},
5756
})

‎manager/types/job.go‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616

1717
package types
1818

19-
const (
20-
// DefaultPreheatJobPieceLength is the default piece length for preheating.
21-
DefaultPreheatJobPieceLength = 4 * 1024 * 1024
22-
)
23-
2419
type CreateJobRequest struct {
2520
BIO string `json:"bio" binding:"omitempty"`
2621
Type string `json:"type" binding:"required"`
@@ -70,9 +65,6 @@ type PreheatArgs struct {
7065
// FilteredQueryParams is the filtered query params for preheating.
7166
FilteredQueryParams string `json:"filtered_query_params" binding:"omitempty"`
7267

73-
// PieceLength is the piece length for preheating.
74-
PieceLength uint32 `json:"piece_length" binding:"omitempty"`
75-
7668
// Headers is the http headers for authentication.
7769
Headers map[string]string `json:"headers" binding:"omitempty"`
7870

‎pkg/idgen/task_id.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package idgen
1818

1919
import (
20-
"fmt"
2120
"strings"
2221

2322
commonv1 "d7y.io/api/v2/pkg/apis/common/v1"
@@ -92,11 +91,11 @@ func parseFilteredQueryParams(rawFilteredQueryParams string) []string {
9291
}
9392

9493
// TaskIDV2 generates v2 version of task id.
95-
func TaskIDV2(url, digest, tag, application string, pieceLength int32, filteredQueryParams []string) string {
94+
func TaskIDV2(url, digest, tag, application string, filteredQueryParams []string) string {
9695
url, err := neturl.FilterQueryParams(url, filteredQueryParams)
9796
if err != nil {
9897
url = ""
9998
}
10099

101-
return pkgdigest.SHA256FromStrings(url, digest, tag, application, fmt.Sprint(pieceLength))
100+
return pkgdigest.SHA256FromStrings(url, digest, tag, application)
102101
}

‎pkg/idgen/task_id_test.go‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ func TestTaskIDV2(t *testing.T) {
113113
digest string
114114
tag string
115115
application string
116-
pieceLength int32
117116
filters []string
118117
expect func(t *testing.T, d any)
119118
}{
@@ -123,11 +122,10 @@ func TestTaskIDV2(t *testing.T) {
123122
digest: "sha256:c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4",
124123
tag: "foo",
125124
application: "bar",
126-
pieceLength: 1,
127125
filters: []string{},
128126
expect: func(t *testing.T, d any) {
129127
assert := assert.New(t)
130-
assert.Equal(d, "6acf73532a2e7b8c30dfc7abce2fd7d2a2cd3746f16b0d54d3e2f136ffa61c90")
128+
assert.Equal(d, "c8659b8372599cf22c7a2de260dd6e148fca6d4e1c2940703022867f739d071d")
131129
},
132130
},
133131
{
@@ -136,7 +134,7 @@ func TestTaskIDV2(t *testing.T) {
136134
digest: "sha256:c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4",
137135
expect: func(t *testing.T, d any) {
138136
assert := assert.New(t)
139-
assert.Equal(d, "b08a435da662ad5ae8ab8359a9c4ebd5027cf14d04b71ccc85f1e197e898adbd")
137+
assert.Equal(d, "60469c583429af631a45540f05e08805b31ca4f84e7974cad35cfc84c197bcf8")
140138
},
141139
},
142140
{
@@ -145,7 +143,7 @@ func TestTaskIDV2(t *testing.T) {
145143
tag: "foo",
146144
expect: func(t *testing.T, d any) {
147145
assert := assert.New(t)
148-
assert.Equal(d, "274c3716c538b5a49e7296ee36dd412bae29948dfb6153e5ac9694e382144f83")
146+
assert.Equal(d, "2773851c628744fb7933003195db436ce397c1722920696c4274ff804d86920b")
149147
},
150148
},
151149
{
@@ -154,16 +152,7 @@ func TestTaskIDV2(t *testing.T) {
154152
application: "bar",
155153
expect: func(t *testing.T, d any) {
156154
assert := assert.New(t)
157-
assert.Equal(d, "ca12c6591c38f726c238f35d9c7945559b52a0dcc10ae191920be6f5f8a0326a")
158-
},
159-
},
160-
{
161-
name: "generate taskID with pieceLength",
162-
url: "https://example.com",
163-
pieceLength: 1,
164-
expect: func(t *testing.T, d any) {
165-
assert := assert.New(t)
166-
assert.Equal(d, "614fb0088e7d82b2538f1ccb5861db5940aaa665b587792898e4be1f591bafec")
155+
assert.Equal(d, "63dee2822037636b0109876b58e95692233840753a882afa69b9b5ee82a6c57d")
167156
},
168157
},
169158
{
@@ -172,14 +161,14 @@ func TestTaskIDV2(t *testing.T) {
172161
filters: []string{"foo", "bar"},
173162
expect: func(t *testing.T, d any) {
174163
assert := assert.New(t)
175-
assert.Equal(d, "4a89bbe790108d4987e7dc5127df2b99aea1c17828f1ff3e55176f49ac974b28")
164+
assert.Equal(d, "100680ad546ce6a577f42f52df33b4cfdca756859e664b8d7de329b150d09ce9")
176165
},
177166
},
178167
}
179168

180169
for _, tc := range tests {
181170
t.Run(tc.name, func(t *testing.T) {
182-
tc.expect(t, TaskIDV2(tc.url, tc.digest, tc.tag, tc.application, tc.pieceLength, tc.filters))
171+
tc.expect(t, TaskIDV2(tc.url, tc.digest, tc.tag, tc.application, tc.filters))
183172
})
184173
}
185174
}

‎scheduler/job/job.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,12 @@ func (j *job) preheatV1(ctx context.Context, req *internaljob.PreheatRequest) er
249249
// preheatV2 preheats job by v2 grpc protocol.
250250
func (j *job) preheatV2(ctx context.Context, req *internaljob.PreheatRequest) error {
251251
filteredQueryParams := strings.Split(req.FilteredQueryParams, idgen.FilteredQueryParamsSeparator)
252-
taskID := idgen.TaskIDV2(req.URL, req.Digest, req.Tag, req.Application, int32(req.PieceLength), filteredQueryParams)
252+
taskID := idgen.TaskIDV2(req.URL, req.Digest, req.Tag, req.Application, filteredQueryParams)
253253

254254
log := logger.WithTask(taskID, req.URL)
255255
log.Infof("preheat(v2) %s tag: %s, filtered query params: %s, digest: %s, headers: %#v",
256256
req.URL, req.Tag, req.FilteredQueryParams, req.Digest, req.Headers)
257257

258-
pieceLength := uint64(req.PieceLength)
259258
stream, err := j.resource.SeedPeer().Client().DownloadTask(ctx, taskID, &dfdaemonv2.DownloadTaskRequest{
260259
Download: &commonv2.Download{
261260
Url: req.URL,
@@ -266,7 +265,6 @@ func (j *job) preheatV2(ctx context.Context, req *internaljob.PreheatRequest) er
266265
Priority: commonv2.Priority(req.Priority),
267266
FilteredQueryParams: filteredQueryParams,
268267
RequestHeader: req.Headers,
269-
PieceLength: &pieceLength,
270268
}})
271269
if err != nil {
272270
logger.Errorf("preheat(v2) %s failed: %s", req.URL, err.Error())

‎scheduler/resource/task_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ var (
5252

5353
mockTaskBackToSourceLimit int32 = 200
5454
mockTaskURL = "http://example.com/foo"
55-
mockTaskID = idgen.TaskIDV2(mockTaskURL, mockTaskDigest.String(), mockTaskTag, mockTaskApplication, mockTaskPieceLength, mockTaskFilteredQueryParams)
55+
mockTaskID = idgen.TaskIDV2(mockTaskURL, mockTaskDigest.String(), mockTaskTag, mockTaskApplication, mockTaskFilteredQueryParams)
5656
mockTaskDigest = digest.New(digest.AlgorithmSHA256, "c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4")
5757
mockTaskTag = "d7y"
5858
mockTaskApplication = "foo"

‎scheduler/scheduling/evaluator/evaluator_base_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ var (
131131

132132
mockTaskBackToSourceLimit int32 = 200
133133
mockTaskURL = "http://example.com/foo"
134-
mockTaskID = idgen.TaskIDV2(mockTaskURL, mockTaskDigest.String(), mockTaskTag, mockTaskApplication, mockTaskPieceLength, mockTaskFilteredQueryParams)
134+
mockTaskID = idgen.TaskIDV2(mockTaskURL, mockTaskDigest.String(), mockTaskTag, mockTaskApplication, mockTaskFilteredQueryParams)
135135
mockTaskDigest = digest.New(digest.AlgorithmSHA256, "c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4")
136136
mockTaskTag = "d7y"
137137
mockTaskApplication = "foo"

0 commit comments

Comments
 (0)