Skip to content

Commit

Permalink
feat: update api version to 2.0.8 (#2566)
Browse files Browse the repository at this point in the history 
Signed-off-by: Gaius <gaius.qi@gmail.com>
  • Loading branch information
@gaius-qi
gaius-qi authored Jul 25, 2023
1 parent b4a390d commit bd3d76a
Show file tree
Hide file tree
Showing 8 changed files with 200 additions and 200 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module d7y.io/dragonfly/v2
go 1.20

require (
d7y.io/api/v2 v2.0.7
d7y.io/api/v2 v2.0.8
github.com/MysteriousPotato/go-lockable v1.0.0
github.com/RichardKnop/machinery v1.10.6
github.com/Showmax/go-fqdn v1.0.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
d7y.io/api/v2 v2.0.7 h1:jfvjTaZ4Q1Z/Ak25u3EU2UuXSDlmVI8OWiwqFW8961A=
d7y.io/api/v2 v2.0.7/go.mod h1:lwCvFjtRVsyTKsiXfh2W0Jdv+5tQGR/vFj+TknwnusY=
d7y.io/api/v2 v2.0.8 h1:LVrbv83ubb2wMyazsgoteQJC+J70qg7JDg7/1zdOYmg=
d7y.io/api/v2 v2.0.8/go.mod h1:lwCvFjtRVsyTKsiXfh2W0Jdv+5tQGR/vFj+TknwnusY=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
Expand Down
4 changes: 2 additions & 2 deletions scheduler/rpcserver/scheduler_server_v2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ func (s *schedulerServerV2) StatTask(ctx context.Context, req *schedulerv2.StatT
func (s *schedulerServerV2) AnnounceHost(ctx context.Context, req *schedulerv2.AnnounceHostRequest) (*emptypb.Empty, error) {
// Collect AnnounceHostCount metrics.
metrics.AnnounceHostCount.WithLabelValues(req.Host.Os, req.Host.Platform, req.Host.PlatformFamily, req.Host.PlatformVersion,
req.Host.KernelVersion, req.Host.Build.GitVersion, req.Host.Build.GitCommit, req.Host.Build.GoVersion, req.Host.Build.Platform).Inc()
req.Host.KernelVersion, req.Host.Build.GitVersion, req.Host.Build.GitCommit, req.Host.Build.GetGoVersion(), req.Host.Build.Platform).Inc()
if err := s.service.AnnounceHost(ctx, req); err != nil {
// Collect AnnounceHostFailureCount metrics.
metrics.AnnounceHostFailureCount.WithLabelValues(req.Host.Os, req.Host.Platform, req.Host.PlatformFamily, req.Host.PlatformVersion,
req.Host.KernelVersion, req.Host.Build.GitVersion, req.Host.Build.GitCommit, req.Host.Build.GoVersion, req.Host.Build.Platform).Inc()
req.Host.KernelVersion, req.Host.Build.GitVersion, req.Host.Build.GitCommit, req.Host.Build.GetGoVersion(), req.Host.Build.Platform).Inc()
return nil, err
}

Expand Down
12 changes: 6 additions & 6 deletions scheduler/scheduling/scheduling.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -671,8 +671,8 @@ func ConstructSuccessSmallTaskResponse(candidateParent *resource.Peer) *schedule
Network: &commonv2.Network{
TcpConnectionCount: candidateParent.Host.Network.TCPConnectionCount,
UploadTcpConnectionCount: candidateParent.Host.Network.UploadTCPConnectionCount,
Location: candidateParent.Host.Network.Location,
Idc: candidateParent.Host.Network.IDC,
Location: &candidateParent.Host.Network.Location,
Idc: &candidateParent.Host.Network.IDC,
},
Disk: &commonv2.Disk{
Total: candidateParent.Host.Disk.Total,
Expand All @@ -687,7 +687,7 @@ func ConstructSuccessSmallTaskResponse(candidateParent *resource.Peer) *schedule
Build: &commonv2.Build{
GitVersion: candidateParent.Host.Build.GitVersion,
GitCommit: candidateParent.Host.Build.GitCommit,
GoVersion: candidateParent.Host.Build.GoVersion,
GoVersion: &candidateParent.Host.Build.GoVersion,
Platform: candidateParent.Host.Build.Platform,
},
}
Expand Down Expand Up @@ -845,8 +845,8 @@ func ConstructSuccessNormalTaskResponse(dynconfig config.DynconfigInterface, can
Network: &commonv2.Network{
TcpConnectionCount: candidateParent.Host.Network.TCPConnectionCount,
UploadTcpConnectionCount: candidateParent.Host.Network.UploadTCPConnectionCount,
Location: candidateParent.Host.Network.Location,
Idc: candidateParent.Host.Network.IDC,
Location: &candidateParent.Host.Network.Location,
Idc: &candidateParent.Host.Network.IDC,
},
Disk: &commonv2.Disk{
Total: candidateParent.Host.Disk.Total,
Expand All @@ -861,7 +861,7 @@ func ConstructSuccessNormalTaskResponse(dynconfig config.DynconfigInterface, can
Build: &commonv2.Build{
GitVersion: candidateParent.Host.Build.GitVersion,
GitCommit: candidateParent.Host.Build.GitCommit,
GoVersion: candidateParent.Host.Build.GoVersion,
GoVersion: &candidateParent.Host.Build.GoVersion,
Platform: candidateParent.Host.Build.Platform,
},
}
Expand Down
18 changes: 9 additions & 9 deletions scheduler/scheduling/scheduling_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1351,8 +1351,8 @@ func TestScheduling_ConstructSuccessSmallTaskResponse(t *testing.T) {
Network: &commonv2.Network{
TcpConnectionCount: candidateParent.Host.Network.TCPConnectionCount,
UploadTcpConnectionCount: candidateParent.Host.Network.UploadTCPConnectionCount,
Location: candidateParent.Host.Network.Location,
Idc: candidateParent.Host.Network.IDC,
Location: &candidateParent.Host.Network.Location,
Idc: &candidateParent.Host.Network.IDC,
},
Disk: &commonv2.Disk{
Total: candidateParent.Host.Disk.Total,
Expand All @@ -1367,7 +1367,7 @@ func TestScheduling_ConstructSuccessSmallTaskResponse(t *testing.T) {
Build: &commonv2.Build{
GitVersion: candidateParent.Host.Build.GitVersion,
GitCommit: candidateParent.Host.Build.GitCommit,
GoVersion: candidateParent.Host.Build.GoVersion,
GoVersion: &candidateParent.Host.Build.GoVersion,
Platform: candidateParent.Host.Build.Platform,
},
},
Expand Down Expand Up @@ -1509,8 +1509,8 @@ func TestScheduling_ConstructSuccessNormalTaskResponse(t *testing.T) {
Network: &commonv2.Network{
TcpConnectionCount: candidateParents[0].Host.Network.TCPConnectionCount,
UploadTcpConnectionCount: candidateParents[0].Host.Network.UploadTCPConnectionCount,
Location: candidateParents[0].Host.Network.Location,
Idc: candidateParents[0].Host.Network.IDC,
Location: &candidateParents[0].Host.Network.Location,
Idc: &candidateParents[0].Host.Network.IDC,
},
Disk: &commonv2.Disk{
Total: candidateParents[0].Host.Disk.Total,
Expand All @@ -1525,7 +1525,7 @@ func TestScheduling_ConstructSuccessNormalTaskResponse(t *testing.T) {
Build: &commonv2.Build{
GitVersion: candidateParents[0].Host.Build.GitVersion,
GitCommit: candidateParents[0].Host.Build.GitCommit,
GoVersion: candidateParents[0].Host.Build.GoVersion,
GoVersion: &candidateParents[0].Host.Build.GoVersion,
Platform: candidateParents[0].Host.Build.Platform,
},
},
Expand Down Expand Up @@ -1641,8 +1641,8 @@ func TestScheduling_ConstructSuccessNormalTaskResponse(t *testing.T) {
Network: &commonv2.Network{
TcpConnectionCount: candidateParents[0].Host.Network.TCPConnectionCount,
UploadTcpConnectionCount: candidateParents[0].Host.Network.UploadTCPConnectionCount,
Location: candidateParents[0].Host.Network.Location,
Idc: candidateParents[0].Host.Network.IDC,
Location: &candidateParents[0].Host.Network.Location,
Idc: &candidateParents[0].Host.Network.IDC,
},
Disk: &commonv2.Disk{
Total: candidateParents[0].Host.Disk.Total,
Expand All @@ -1657,7 +1657,7 @@ func TestScheduling_ConstructSuccessNormalTaskResponse(t *testing.T) {
Build: &commonv2.Build{
GitVersion: candidateParents[0].Host.Build.GitVersion,
GitCommit: candidateParents[0].Host.Build.GitCommit,
GoVersion: candidateParents[0].Host.Build.GoVersion,
GoVersion: &candidateParents[0].Host.Build.GoVersion,
Platform: candidateParents[0].Host.Build.Platform,
},
},
Expand Down
6 changes: 3 additions & 3 deletions scheduler/service/service_v1_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@ var (
Network: &commonv2.Network{
TcpConnectionCount: mockNetwork.TCPConnectionCount,
UploadTcpConnectionCount: mockNetwork.UploadTCPConnectionCount,
Location: mockNetwork.Location,
Idc: mockNetwork.IDC,
Location: &mockNetwork.Location,
Idc: &mockNetwork.IDC,
},
Disk: &commonv2.Disk{
Total: mockDisk.Total,
Expand All @@ -292,7 +292,7 @@ var (
Build: &commonv2.Build{
GitVersion: mockBuild.GitVersion,
GitCommit: mockBuild.GitCommit,
GoVersion: mockBuild.GoVersion,
GoVersion: &mockBuild.GoVersion,
Platform: mockBuild.Platform,
},
},
Expand Down
Loading

0 comments on commit bd3d76a

Please sign in to comment.