feat: update

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

Author: gaius-qi

manager/job/preheat_test.go

@@ -25,7 +25,7 @@ func TestPreheat_GetImageLayers(t *testing.T) {
 			},
 			expect: func(t *testing.T, layers []internaljob.PreheatRequest) {
 				assert := assert.New(t)
-				assert.Equal(2, len(layers))
+				assert.Equal(2, len(layers[0].URLs))
 			},
 		},
 		{
@@ -36,7 +36,7 @@ func TestPreheat_GetImageLayers(t *testing.T) {
 			},
 			expect: func(t *testing.T, layers []internaljob.PreheatRequest) {
 				assert := assert.New(t)
-				assert.Equal(5, len(layers))
+				assert.Equal(5, len(layers[0].URLs))
 			},
 		},
 	}

manager/types/job.go

@@ -31,10 +31,10 @@ const (
 
 const (
 	// DefaultPreheatConcurrentCount is the default concurrent count for preheating all peers.
-	DefaultPreheatConcurrentCount = 500
+	DefaultPreheatConcurrentCount = 1000
 
 	// DefaultJobTimeout is the default timeout for executing job.
-	DefaultJobTimeout = 30 * time.Minute
+	DefaultJobTimeout = 60 * time.Minute
 )
 
 type CreateJobRequest struct {

scheduler/job/job.go

@@ -386,15 +386,15 @@ func (j *job) preheatAllSeedPeers(ctx context.Context, req *internaljob.PreheatR
 
 	eg, _ := errgroup.WithContext(ctx)
 	eg.SetLimit(int(req.ConcurrentCount))
-	for _, seedPeer := range seedPeers {
-		var (
-			hostname = seedPeer.Hostname
-			ip       = seedPeer.Ip
-			port     = seedPeer.Port
-		)
-
-		addr := fmt.Sprintf("%s:%d", ip, port)
-		for _, url := range req.URLs {
+	for _, url := range req.URLs {
+		for _, seedPeer := range seedPeers {
+			var (
+				hostname = seedPeer.Hostname
+				ip       = seedPeer.Ip
+				port     = seedPeer.Port
+			)
+
+			addr := fmt.Sprintf("%s:%d", ip, port)
 			eg.Go(func() error {
 				taskID := idgen.TaskIDV2ByURLBased(url, req.PieceLength, req.Tag, req.Application, strings.Split(req.FilteredQueryParams, idgen.FilteredQueryParamsSeparator))
 				hostID := idgen.HostIDV2(ip, hostname, true)
@@ -571,15 +571,15 @@ func (j *job) preheatAllPeers(ctx context.Context, req *internaljob.PreheatReque
 
 	eg, _ := errgroup.WithContext(ctx)
 	eg.SetLimit(int(req.ConcurrentCount))
-	for _, peer := range peers {
-		var (
-			hostname = peer.Hostname
-			ip       = peer.IP
-			port     = peer.Port
-		)
-
-		addr := fmt.Sprintf("%s:%d", ip, port)
-		for _, url := range req.URLs {
+	for _, url := range req.URLs {
+		for _, peer := range peers {
+			var (
+				hostname = peer.Hostname
+				ip       = peer.IP
+				port     = peer.Port
+			)
+
+			addr := fmt.Sprintf("%s:%d", ip, port)
 			eg.Go(func() error {
 				taskID := idgen.TaskIDV2ByURLBased(url, req.PieceLength, req.Tag, req.Application, strings.Split(req.FilteredQueryParams, idgen.FilteredQueryParamsSeparator))
 				hostID := idgen.HostIDV2(ip, hostname, false)

test/e2e/manager/preheat.go

@@ -59,7 +59,7 @@ var _ = Describe("Preheat with Manager", func() {
 				Type: internaljob.PreheatJob,
 				Args: types.PreheatArgs{
 					Type: "file",
-					URL:  testFile.GetDownloadURL(),
+					URLs: []string{testFile.GetDownloadURL()},
 				},
 			})
 			Expect(err).NotTo(HaveOccurred())
@@ -117,7 +117,7 @@ var _ = Describe("Preheat with Manager", func() {
 				Type: internaljob.PreheatJob,
 				Args: types.PreheatArgs{
 					Type: "file",
-					URL:  testFile.GetDownloadURL(),
+					URLs: []string{testFile.GetDownloadURL()},
 				},
 			})
 			Expect(err).NotTo(HaveOccurred())
@@ -175,7 +175,7 @@ var _ = Describe("Preheat with Manager", func() {
 				Type: internaljob.PreheatJob,
 				Args: types.PreheatArgs{
 					Type: "file",
-					URL:  testFile.GetDownloadURL(),
+					URLs: []string{testFile.GetDownloadURL()},
 				},
 			})
 			Expect(err).NotTo(HaveOccurred())
@@ -233,7 +233,7 @@ var _ = Describe("Preheat with Manager", func() {
 				Type: internaljob.PreheatJob,
 				Args: types.PreheatArgs{
 					Type:        "file",
-					URL:         testFile.GetDownloadURL(),
+					URLs:        []string{testFile.GetDownloadURL()},
 					Scope:       "single_seed_peer",
 					LoadToCache: true,
 				},