feat: update d7y.io/api package and change cpu percent validation (#2236

) Signed-off-by: Gaius <gaius.qi@gmail.com>
dragonflyoss · Mar 31, 2023 · bcd992e · bcd992e
1 parent 4bfdd24
commit bcd992e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module d7y.io/dragonfly/v2
 go 1.20
 
 require (
-	d7y.io/api v1.8.5
+	d7y.io/api v1.8.6
 	github.com/RichardKnop/machinery v1.10.6
 	github.com/Showmax/go-fqdn v1.0.0
 	github.com/VividCortex/mysqlerr v1.0.0

diff --git a/go.sum b/go.sum
@@ -51,8 +51,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 v1.8.5 h1:8LnSRrXiEY6XODK+GTgkrgBZkmONhLcyfDlarWpDrfw=
-d7y.io/api v1.8.5/go.mod h1:HIJMfhqiBHJ0yNVuOASQe6X0IVzOkxdLiWzcMM0xo2c=
+d7y.io/api v1.8.6 h1:AgZH5Nh/hFGd+6tjsym/lO9vYCyqT1Qz+cZxYnBacgc=
+d7y.io/api v1.8.6/go.mod h1:HIJMfhqiBHJ0yNVuOASQe6X0IVzOkxdLiWzcMM0xo2c=
 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=

diff --git a/manager/rpcserver/manager_server_v1.go b/manager/rpcserver/manager_server_v1.go
@@ -104,7 +104,7 @@ func (s *managerServerV1) GetSeedPeer(ctx context.Context, req *managerv1.GetSee
 		return &pbSeedPeer, nil
 	}
 
-	// Cache miss.
+	// Cache miss and search seed peer.
 	seedPeer := models.SeedPeer{}
 	if err := s.db.WithContext(ctx).Preload("SeedPeerCluster").Preload("SeedPeerCluster.SchedulerClusters.Schedulers", &models.Scheduler{
 		State: models.SchedulerStateActive,
@@ -276,7 +276,7 @@ func (s *managerServerV1) GetScheduler(ctx context.Context, req *managerv1.GetSc
 		return &pbScheduler, nil
 	}
 
-	// Cache miss.
+	// Cache miss and search scheduler.
 	scheduler := models.Scheduler{}
 	if err := s.db.WithContext(ctx).Preload("SchedulerCluster").Preload("SchedulerCluster.SeedPeerClusters.SeedPeers", &models.SeedPeer{
 		State: models.SeedPeerStateActive,
@@ -636,7 +636,7 @@ func (s *managerServerV1) ListBuckets(ctx context.Context, req *managerv1.ListBu
 		return &pbListBucketsResponse, nil
 	}
 
-	// Cache miss.
+	// Cache miss and search buckets.
 	buckets, err := s.objectStorage.ListBucketMetadatas(ctx)
 	if err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
@@ -676,7 +676,7 @@ func (s *managerServerV1) ListApplications(ctx context.Context, req *managerv1.L
 		return &pbListApplicationsResponse, nil
 	}
 
-	// Cache miss.
+	// Cache miss and search applications.
 	var applications []models.Application
 	if err := s.db.WithContext(ctx).Find(&applications, "priority != ?", "").Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {

diff --git a/manager/rpcserver/manager_server_v2.go b/manager/rpcserver/manager_server_v2.go
@@ -104,7 +104,7 @@ func (s *managerServerV2) GetSeedPeer(ctx context.Context, req *managerv2.GetSee
 		return &pbSeedPeer, nil
 	}
 
-	// Cache miss.
+	// Cache miss and search seed peer.
 	seedPeer := models.SeedPeer{}
 	if err := s.db.WithContext(ctx).Preload("SeedPeerCluster").Preload("SeedPeerCluster.SchedulerClusters.Schedulers", &models.Scheduler{
 		State: models.SchedulerStateActive,
@@ -276,7 +276,7 @@ func (s *managerServerV2) GetScheduler(ctx context.Context, req *managerv2.GetSc
 		return &pbScheduler, nil
 	}
 
-	// Cache miss.
+	// Cache miss and search scheduler.
 	scheduler := models.Scheduler{}
 	if err := s.db.WithContext(ctx).Preload("SchedulerCluster").Preload("SchedulerCluster.SeedPeerClusters.SeedPeers", &models.SeedPeer{
 		State: models.SeedPeerStateActive,
@@ -635,7 +635,7 @@ func (s *managerServerV2) ListBuckets(ctx context.Context, req *managerv2.ListBu
 		return &pbListBucketsResponse, nil
 	}
 
-	// Cache miss.
+	// Cache miss and search buckets.
 	buckets, err := s.objectStorage.ListBucketMetadatas(ctx)
 	if err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
@@ -675,7 +675,7 @@ func (s *managerServerV2) ListApplications(ctx context.Context, req *managerv2.L
 		return &pbListApplicationsResponse, nil
 	}
 
-	// Cache miss.
+	// Cache miss and search applications.
 	var applications []models.Application
 	if err := s.db.WithContext(ctx).Find(&applications, "priority != ?", "").Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {