feat: support preheat by peer count (#4066)

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

Author: gaius-qi

internal/job/types.go

@@ -31,6 +31,7 @@ type PreheatRequest struct {
 	Priority                    int32             `json:"priority" validate:"omitempty"`
 	Scope                       string            `json:"scope" validate:"omitempty"`
 	Percentage                  *uint8            `json:"percentage" validate:"omitempty,gte=1,lte=100"`
+	Count                       *uint32           `json:"count" validate:"omitempty,gte=1,lte=200"`
 	ConcurrentCount             int64             `json:"concurrent_count" validate:"omitempty"`
 	CertificateChain            [][]byte          `json:"certificate_chain" validate:"omitempty"`
 	InsecureSkipVerify          bool              `json:"insecure_skip_verify" validate:"omitempty"`

manager/job/preheat.go

@@ -145,6 +145,7 @@ func (p *preheat) CreatePreheat(ctx context.Context, schedulers []models.Schedul
 				Headers:                     json.Headers,
 				Scope:                       json.Scope,
 				Percentage:                  json.Percentage,
+				Count:                       json.Count,
 				ConcurrentCount:             json.ConcurrentCount,
 				CertificateChain:            p.certificateChain,
 				InsecureSkipVerify:          p.insecureSkipVerify,
@@ -174,7 +175,7 @@ func (p *preheat) createGroupJob(ctx context.Context, files []internaljob.Prehea
 		for _, file := range files {
 			args, err := internaljob.MarshalRequest(file)
 			if err != nil {
-				logger.Errorf("preheat marshal request: %v, error: %v", file, err)
+				logger.Errorf("[preheat]: preheat marshal request: %v, error: %v", file, err)
 				continue
 			}
 
@@ -197,9 +198,9 @@ func (p *preheat) createGroupJob(ctx context.Context, files []internaljob.Prehea
 		tasks = append(tasks, *signature)
 	}
 
-	logger.Infof("create preheat group %s in queues %v, tasks: %#v", group.GroupUUID, queues, tasks)
+	logger.Infof("[preheat]: create preheat group %s in queues %v, tasks: %#v", group.GroupUUID, queues, tasks)
 	if _, err := p.job.Server.SendGroupWithContext(ctx, group, 0); err != nil {
-		logger.Errorf("create preheat group %s failed", group.GroupUUID, err)
+		logger.Errorf("[preheat]: create preheat group %s failed", group.GroupUUID, err)
 		return nil, err
 	}
 
@@ -372,6 +373,7 @@ func (p *preheat) parseLayers(manifests []distribution.Manifest, args types.Preh
 				Headers:             nethttp.HeaderToMap(header),
 				Scope:               args.Scope,
 				Percentage:          args.Percentage,
+				Count:               args.Count,
 				ConcurrentCount:     args.ConcurrentCount,
 				CertificateChain:    p.certificateChain,
 				InsecureSkipVerify:  p.insecureSkipVerify,

manager/types/job.go

@@ -145,9 +145,15 @@ type PreheatArgs struct {
 	// Scope is the scope for preheating, default is single_seed_peer.
 	Scope string `json:"scope" binding:"omitempty"`
 
-	// Percentage is the percentage of the peer to be preheated.
+	// Percentage is the percentage of peers to be preheated.
+	// It must be a value between 1 and 100 (inclusive) if provided.
 	Percentage *uint8 `json:"percentage" binding:"omitempty,gte=1,lte=100"`
 
+	// Count is the number of peers to be preheated.
+	// It must be a value between 1 and 200 (inclusive) if provided.
+	// If both Percentage and Count are provided, Count will be used.
+	Count *uint32 `json:"count" binding:"omitempty,gte=1,lte=200"`
+
 	// BatchSize is the batch size for preheating all peers, default is 50.
 	ConcurrentCount int64 `json:"concurrent_count" binding:"omitempty,gte=1,lte=500"`