dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add begin seed piece hint task registered successfully (#997) 

* cdn obtainSeeds add begin seed piece hint register successfully

Signed-off-by: sunwp <244372610@qq.com>

* feat: scheduler handle begin of piece

Signed-off-by: Gaius <gaius.qi@gmail.com>

* test: trigger cdn task

Signed-off-by: Gaius <gaius.qi@gmail.com>

Co-authored-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
sunwp 2022-01-20 16:57:38 +08:00 committed by Gaius
parent e9f824e0a7
commit f63c705b98
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
5 changed files with 68 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/compatibility-e2e.yml vendored
View File

@ -13,7 +13,7 @@ env:
KIND_VERSION: v0.11.1
CONTAINERD_VERSION: v1.5.2
KIND_CONFIG_PATH: test/testdata/kind/config.yaml
DRAGONFLY_STABLE_IMAGE_TAG: v2.0.1-rc.10
DRAGONFLY_STABLE_IMAGE_TAG: v2.0.2-beta.3
DRAGONFLY_CHARTS_PATH: deploy/helm-charts/charts/dragonfly
DRAGONFLY_CHARTS_CONFIG_PATH: test/testdata/charts/config.yaml
DRAGONFLY_FILE_SERVER_PATH: test/testdata/k8s/file-server.yaml

12
cdn/rpcserver/rpcserver.go
View File

@ -35,6 +35,7 @@ import (
"d7y.io/dragonfly/v2/pkg/idgen"
"d7y.io/dragonfly/v2/pkg/rpc"
"d7y.io/dragonfly/v2/pkg/rpc/base"
"d7y.io/dragonfly/v2/pkg/rpc/base/common"
"d7y.io/dragonfly/v2/pkg/rpc/cdnsystem"
cdnserver "d7y.io/dragonfly/v2/pkg/rpc/cdnsystem/server"
"d7y.io/dragonfly/v2/pkg/util/digestutils"
@ -91,6 +92,17 @@ func (css *Server) ObtainSeeds(ctx context.Context, req *cdnsystem.SeedRequest,
}
peerID := idgen.CDNPeerID(css.config.AdvertiseIP)
hostID := idgen.CDNHostID(hostutils.FQDNHostname, int32(css.config.ListenPort))
// begin piece, hint register success
psc <- &cdnsystem.PieceSeed{
PeerId: peerID,
HostUuid: hostID,
PieceInfo: &base.PieceInfo{
PieceNum: common.BeginOfPiece,
},
Done: false,
ContentLength: registeredTask.SourceFileLength,
TotalPieceCount: registeredTask.TotalPieceCount,
}
for piece := range pieceChan {
pieceSeed := &cdnsystem.PieceSeed{
PeerId: peerID,

30
scheduler/resource/cdn.go
View File

@ -27,6 +27,7 @@ import (
logger "d7y.io/dragonfly/v2/internal/dflog"
"d7y.io/dragonfly/v2/internal/dfnet"
"d7y.io/dragonfly/v2/pkg/idgen"
"d7y.io/dragonfly/v2/pkg/rpc/base/common"
"d7y.io/dragonfly/v2/pkg/rpc/cdnsystem"
cdnclient "d7y.io/dragonfly/v2/pkg/rpc/cdnsystem/client"
rpcscheduler "d7y.io/dragonfly/v2/pkg/rpc/scheduler"
@ -51,17 +52,12 @@ type cdn struct {
}
// New cdn interface
func newCDN(peerManager PeerManager, hostManager HostManager, dynconfig config.DynconfigInterface, opts ...grpc.DialOption) (CDN, error) {
client, err := newCDNClient(dynconfig, hostManager, opts...)
if err != nil {
return nil, err
}
func newCDN(peerManager PeerManager, hostManager HostManager, client CDNClient) CDN {
return &cdn{
client: client,
peerManager: peerManager,
hostManager: hostManager,
}, nil
}
}
// TriggerTask start to trigger cdn task
@ -75,24 +71,16 @@ func (c *cdn) TriggerTask(ctx context.Context, task *Task) (*Peer, *rpcscheduler
return nil, nil, err
}
var (
initialized bool
peer *Peer
)
// Receive pieces from cdn
var peer *Peer
for {
piece, err := stream.Recv()
if err != nil {
return nil, nil, err
}
task.Log.Infof("receive piece: %#v %#v", piece, piece.PieceInfo)
// Init cdn peer
if !initialized {
initialized = true
// Handle begin of piece
if piece.PieceInfo != nil && piece.PieceInfo.PieceNum == common.BeginOfPiece {
task.Log.Infof("receive begin o piece: %#v %#v", piece, piece.PieceInfo)
peer, err = c.initPeer(task, piece)
if err != nil {
return nil, nil, err
@ -101,9 +89,10 @@ func (c *cdn) TriggerTask(ctx context.Context, task *Task) (*Peer, *rpcscheduler
if err := peer.FSM.Event(PeerEventDownload); err != nil {
return nil, nil, err
}
continue
}
// Get end piece
// Handle end of piece
if piece.Done {
peer.Log.Infof("receive end of piece: %#v %#v", piece, piece.PieceInfo)
@ -134,6 +123,7 @@ func (c *cdn) TriggerTask(ctx context.Context, task *Task) (*Peer, *rpcscheduler
}
// Update piece info
peer.Log.Infof("receive piece: %#v %#v", piece, piece.PieceInfo)
peer.Pieces.Set(uint(piece.PieceInfo.PieceNum))
// TODO(244372610) CDN should set piece cost
peer.AppendPieceCost(0)

84
scheduler/resource/cdn_test.go
View File

@ -17,9 +17,11 @@
package resource
import (
"context"
"encoding/json"
"errors"
"fmt"
"reflect"
"testing"
gomock "github.com/golang/mock/gomock"
@ -27,6 +29,7 @@ import (
"d7y.io/dragonfly/v2/internal/dfnet"
"d7y.io/dragonfly/v2/manager/types"
rpcscheduler "d7y.io/dragonfly/v2/pkg/rpc/scheduler"
"d7y.io/dragonfly/v2/scheduler/config"
configmocks "d7y.io/dragonfly/v2/scheduler/config/mocks"
)
@ -34,47 +37,13 @@ import (
func TestCDN_newCDN(t *testing.T) {
tests := []struct {
name string
mock func(dynconfig *configmocks.MockDynconfigInterfaceMockRecorder, hostManager *MockHostManagerMockRecorder)
expect func(t *testing.T, err error)
expect func(t *testing.T, cdn CDN)
}{
{
name: "new cdn",
mock: func(dynconfig *configmocks.MockDynconfigInterfaceMockRecorder, hostManager *MockHostManagerMockRecorder) {
gomock.InOrder(
dynconfig.Get().Return(&config.DynconfigData{
CDNs: []*config.CDN{{ID: 1}},
}, nil).Times(1),
hostManager.Store(gomock.Any()).Return().Times(1),
dynconfig.Register(gomock.Any()).Return().Times(1),
)
},
expect: func(t *testing.T, err error) {
expect: func(t *testing.T, cdn CDN) {
assert := assert.New(t)
assert.NoError(err)
},
},
{
name: "new cdn failed because of dynconfig get error data",
mock: func(dynconfig *configmocks.MockDynconfigInterfaceMockRecorder, hostManager *MockHostManagerMockRecorder) {
dynconfig.Get().Return(nil, errors.New("foo")).Times(1)
},
expect: func(t *testing.T, err error) {
assert := assert.New(t)
assert.EqualError(err, "foo")
},
},
{
name: "new cdn failed because of cdn list is empty",
mock: func(dynconfig *configmocks.MockDynconfigInterfaceMockRecorder, hostManager *MockHostManagerMockRecorder) {
gomock.InOrder(
dynconfig.Get().Return(&config.DynconfigData{
CDNs: []*config.CDN{},
}, nil).Times(1),
)
},
expect: func(t *testing.T, err error) {
assert := assert.New(t)
assert.EqualError(err, "address list of cdn is empty")
assert.Equal(reflect.TypeOf(cdn).Elem().Name(), "cdn")
},
},
}
@ -83,13 +52,46 @@ func TestCDN_newCDN(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
ctl := gomock.NewController(t)
defer ctl.Finish()
dynconfig := configmocks.NewMockDynconfigInterface(ctl)
hostManager := NewMockHostManager(ctl)
peerManager := NewMockPeerManager(ctl)
tc.mock(dynconfig.EXPECT(), hostManager.EXPECT())
client := NewMockCDNClient(ctl)
_, err := newCDN(peerManager, hostManager, dynconfig)
tc.expect(t, err)
tc.expect(t, newCDN(peerManager, hostManager, client))
})
}
}
func TestCDN_TriggerTask(t *testing.T) {
tests := []struct {
name string
mock func(mc *MockCDNClientMockRecorder)
expect func(t *testing.T, peer *Peer, result *rpcscheduler.PeerResult, err error)
}{
{
name: "start obtain seed stream failed",
mock: func(mc *MockCDNClientMockRecorder) {
mc.ObtainSeeds(gomock.Any(), gomock.Any()).Return(nil, errors.New("foo")).Times(1)
},
expect: func(t *testing.T, peer *Peer, result *rpcscheduler.PeerResult, err error) {
assert := assert.New(t)
assert.EqualError(err, "foo")
},
},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
ctl := gomock.NewController(t)
defer ctl.Finish()
hostManager := NewMockHostManager(ctl)
peerManager := NewMockPeerManager(ctl)
client := NewMockCDNClient(ctl)
tc.mock(client.EXPECT())
cdn := newCDN(peerManager, hostManager, client)
mockTask := NewTask(mockTaskID, mockTaskURL, mockTaskBackToSourceLimit, mockTaskURLMeta)
peer, result, err := cdn.TriggerTask(context.Background(), mockTask)
tc.expect(t, peer, result, err)
})
}
}

3
scheduler/resource/resource.go
View File

@ -71,10 +71,11 @@ func New(cfg *config.Config, gc gc.GC, dynconfig config.DynconfigInterface, opts
}
// Initialize cdn interface
cdn, err := newCDN(peerManager, hostManager, dynconfig, opts...)
client, err := newCDNClient(dynconfig, hostManager, opts...)
if err != nil {
return nil, err
}
cdn := newCDN(peerManager, hostManager, client)
return &resource{
cdn: cdn,