Skip to content

Commit a35517c

Browse files
authored
feat: remove unused context and update api version (#3412)
Signed-off-by: Gaius <gaius.qi@gmail.com>
1 parent 9698903 commit a35517c

File tree

8 files changed

+39
-29
lines changed

8 files changed

+39
-29
lines changed

.github/workflows/compatibility-e2e-v2.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ jobs:
2828
include:
2929
- module: manager
3030
image: manager
31-
image-tag: v2.1.46
31+
image-tag: v2.1.53
3232
chart-name: manager
3333
- module: scheduler
3434
image: scheduler
35-
image-tag: v2.1.46
35+
image-tag: v2.1.53
3636
chart-name: scheduler
3737
- module: client
3838
image: client
39-
image-tag: v0.1.76
39+
image-tag: v0.1.95
4040
chart-name: client
4141
- module: seed-client
4242
image: client
43-
image-tag: v0.1.76
43+
image-tag: v0.1.95
4444
chart-name: seed-client
4545

4646
steps:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module d7y.io/dragonfly/v2
33
go 1.21
44

55
require (
6-
d7y.io/api/v2 v2.0.141
6+
d7y.io/api/v2 v2.0.142
77
github.com/MysteriousPotato/go-lockable v1.0.0
88
github.com/RichardKnop/machinery v1.10.8
99
github.com/Showmax/go-fqdn v1.0.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
5353
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
5454
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
5555
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
56-
d7y.io/api/v2 v2.0.141 h1:pRGCLKcNtBB026b/sJXMBVeh1Ik0/7nxHN7YFXi1uhU=
57-
d7y.io/api/v2 v2.0.141/go.mod h1:IakrltEphFvcLIQs3NVeb9PAe66MGDnd2/HMs9DKYu8=
56+
d7y.io/api/v2 v2.0.142 h1:u1gQZwCKJODdJB883J9e5SRK9VmOTmApX13FX/bR0Vk=
57+
d7y.io/api/v2 v2.0.142/go.mod h1:IakrltEphFvcLIQs3NVeb9PAe66MGDnd2/HMs9DKYu8=
5858
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
5959
github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
6060
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=

pkg/digest/digest.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"errors"
2727
"fmt"
2828
"hash"
29+
"hash/crc32"
2930
"io"
3031
"os"
3132
"strings"
@@ -34,6 +35,9 @@ import (
3435
)
3536

3637
const (
38+
// AlgorithmCRC32 is crc32 algorithm name of hash.
39+
AlgorithmCRC32 = "crc32"
40+
3741
// AlgorithmBlake3 is blake3 algorithm name of hash.
3842
AlgorithmBlake3 = "blake3"
3943

@@ -82,6 +86,8 @@ func HashFile(path string, algorithm string) (string, error) {
8286

8387
var h hash.Hash
8488
switch algorithm {
89+
case AlgorithmCRC32:
90+
h = crc32.NewIEEE()
8591
case AlgorithmBlake3:
8692
h = blake3.New()
8793
case AlgorithmSHA1:
@@ -116,6 +122,10 @@ func Parse(digest string) (*Digest, error) {
116122
encoded := values[1]
117123

118124
switch algorithm {
125+
case AlgorithmCRC32:
126+
if len(encoded) != 8 {
127+
return nil, errors.New("invalid encoded")
128+
}
119129
case AlgorithmBlake3:
120130
if len(encoded) != 64 {
121131
return nil, errors.New("invalid encoded")

pkg/objectstorage/mocks/objectstorage_mock.go

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scheduler/service/service_v2.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func (v *V2) AnnouncePeer(stream schedulerv2.Scheduler_AnnouncePeerServer) error
171171
case *schedulerv2.AnnouncePeerRequest_DownloadPieceFinishedRequest:
172172
piece := announcePeerRequest.DownloadPieceFinishedRequest.Piece
173173
log.Infof("receive DownloadPieceFinishedRequest, piece number: %d, piece length: %d, traffic type: %s, cost: %s, parent id: %s", piece.GetNumber(), piece.GetLength(), piece.GetTrafficType(), piece.GetCost().AsDuration().String(), piece.GetParentId())
174-
if err := v.handleDownloadPieceFinishedRequest(ctx, req.GetPeerId(), announcePeerRequest.DownloadPieceFinishedRequest); err != nil {
174+
if err := v.handleDownloadPieceFinishedRequest(req.GetPeerId(), announcePeerRequest.DownloadPieceFinishedRequest); err != nil {
175175
log.Error(err)
176176
return err
177177
}
@@ -1154,7 +1154,7 @@ func (v *V2) handleDownloadPeerBackToSourceFailedRequest(ctx context.Context, pe
11541154
}
11551155

11561156
// handleDownloadPieceFinishedRequest handles DownloadPieceFinishedRequest of AnnouncePeerRequest.
1157-
func (v *V2) handleDownloadPieceFinishedRequest(ctx context.Context, peerID string, req *schedulerv2.DownloadPieceFinishedRequest) error {
1157+
func (v *V2) handleDownloadPieceFinishedRequest(peerID string, req *schedulerv2.DownloadPieceFinishedRequest) error {
11581158
// Construct piece.
11591159
piece := &resource.Piece{
11601160
Number: int32(req.Piece.GetNumber()),

scheduler/service/service_v2_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2477,7 +2477,7 @@ func TestServiceV2_handleDownloadPieceFinishedRequest(t *testing.T) {
24772477
},
24782478
run: func(t *testing.T, svc *V2, req *schedulerv2.DownloadPieceFinishedRequest, peer *resource.Peer, peerManager resource.PeerManager, mr *resource.MockResourceMockRecorder, mp *resource.MockPeerManagerMockRecorder) {
24792479
assert := assert.New(t)
2480-
assert.ErrorIs(svc.handleDownloadPieceFinishedRequest(context.Background(), peer.ID, req), status.Error(codes.InvalidArgument, "invalid digest"))
2480+
assert.ErrorIs(svc.handleDownloadPieceFinishedRequest(peer.ID, req), status.Error(codes.InvalidArgument, "invalid digest"))
24812481
},
24822482
},
24832483
{
@@ -2501,7 +2501,7 @@ func TestServiceV2_handleDownloadPieceFinishedRequest(t *testing.T) {
25012501
)
25022502

25032503
assert := assert.New(t)
2504-
assert.ErrorIs(svc.handleDownloadPieceFinishedRequest(context.Background(), peer.ID, req), status.Errorf(codes.NotFound, "peer %s not found", peer.ID))
2504+
assert.ErrorIs(svc.handleDownloadPieceFinishedRequest(peer.ID, req), status.Errorf(codes.NotFound, "peer %s not found", peer.ID))
25052505
},
25062506
},
25072507
{
@@ -2527,7 +2527,7 @@ func TestServiceV2_handleDownloadPieceFinishedRequest(t *testing.T) {
25272527
)
25282528

25292529
assert := assert.New(t)
2530-
assert.NoError(svc.handleDownloadPieceFinishedRequest(context.Background(), peer.ID, req))
2530+
assert.NoError(svc.handleDownloadPieceFinishedRequest(peer.ID, req))
25312531

25322532
piece, loaded := peer.LoadPiece(int32(req.Piece.Number))
25332533
assert.True(loaded)
@@ -2569,7 +2569,7 @@ func TestServiceV2_handleDownloadPieceFinishedRequest(t *testing.T) {
25692569
)
25702570

25712571
assert := assert.New(t)
2572-
assert.NoError(svc.handleDownloadPieceFinishedRequest(context.Background(), peer.ID, req))
2572+
assert.NoError(svc.handleDownloadPieceFinishedRequest(peer.ID, req))
25732573

25742574
piece, loaded := peer.LoadPiece(int32(req.Piece.Number))
25752575
assert.True(loaded)

0 commit comments

Comments
 (0)