feat: increase interval of the preheat polling (#3544)

Signed-off-by: Gaius <[email protected]>
dragonflyoss · Sep 29, 2024 · 7253f0f · 7253f0f
1 parent 7a83e5a
commit 7253f0f
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 2 deletions.
diff --git a/manager/router/router.go b/manager/router/router.go
@@ -212,7 +212,7 @@ func Init(cfg *config.Config, logDir string, service service.Service, database *
 	job.POST("", middlewares.RateLimit(cfg.Job.RateLimit.FillInterval, cfg.Job.RateLimit.Capacity, cfg.Job.RateLimit.Quantum), h.CreateJob)
 	job.DELETE(":id", h.DestroyJob)
 	job.PATCH(":id", h.UpdateJob)
-	job.GET(":id", h.GetJob)
+	job.GET(":id", middlewares.RateLimit(cfg.Job.RateLimit.FillInterval, cfg.Job.RateLimit.Capacity, cfg.Job.RateLimit.Quantum), h.GetJob)
 	job.GET("", h.GetJobs)
 
 	// Application.

diff --git a/manager/service/job.go b/manager/service/job.go
@@ -288,7 +288,7 @@ func (s *service) pollingJob(ctx context.Context, name string, id uint, groupID
 		job models.Job
 		log = logger.WithGroupAndJobID(groupID, fmt.Sprint(id))
 	)
-	if _, _, err := retry.Run(ctx, 5, 10, 480, func() (any, bool, error) {
+	if _, _, err := retry.Run(ctx, 30, 300, 16, func() (any, bool, error) {
 		groupJob, err := s.job.GetGroupJobState(name, groupID)
 		if err != nil {
 			log.Errorf("polling group failed: %s", err.Error())

diff --git a/test/testdata/charts/config-cache-list-metadata.yaml b/test/testdata/charts/config-cache-list-metadata.yaml
@@ -152,3 +152,8 @@ manager:
     enable: true
   config:
     verbose: true
+    job:
+      rateLimit:
+        fillInterval: 1m
+        capacity: 100
+        quantum: 100
diff --git a/test/testdata/charts/config-compatibility.yaml b/test/testdata/charts/config-compatibility.yaml
@@ -149,6 +149,11 @@ manager:
     enable: true
   config:
     verbose: true
+    job:
+      rateLimit:
+        fillInterval: 1m
+        capacity: 100
+        quantum: 100
     cache:
       redis:
         ttl: 1m

diff --git a/test/testdata/charts/config-concurent-back-source.yaml b/test/testdata/charts/config-concurent-back-source.yaml
@@ -157,3 +157,8 @@ manager:
     enable: true
   config:
     verbose: true
+    job:
+      rateLimit:
+        fillInterval: 1m
+        capacity: 100
+        quantum: 100
diff --git a/test/testdata/charts/config-disable-seed-peer.yaml b/test/testdata/charts/config-disable-seed-peer.yaml
@@ -121,3 +121,8 @@ manager:
     enable: true
   config:
     verbose: true
+    job:
+      rateLimit:
+        fillInterval: 1m
+        capacity: 100
+        quantum: 100
diff --git a/test/testdata/charts/config-grpc-tls-ipv6.yaml b/test/testdata/charts/config-grpc-tls-ipv6.yaml
@@ -274,6 +274,11 @@ manager:
     enable: true
   config:
     verbose: true
+    job:
+      rateLimit:
+        fillInterval: 1m
+        capacity: 100
+        quantum: 100
     security:
       autoIssueCert: true
       tlsPolicy: prefer

diff --git a/test/testdata/charts/config-grpc-tls.yaml b/test/testdata/charts/config-grpc-tls.yaml
@@ -268,6 +268,11 @@ manager:
     enable: true
   config:
     verbose: true
+    job:
+      rateLimit:
+        fillInterval: 1m
+        capacity: 100
+        quantum: 100
     security:
       autoIssueCert: true
       tlsPolicy: prefer

diff --git a/test/testdata/charts/config-ipv6.yaml b/test/testdata/charts/config-ipv6.yaml
@@ -157,3 +157,8 @@ manager:
     verbose: true
     network:
       enableIPv6: true
+    job:
+      rateLimit:
+        fillInterval: 1m
+        capacity: 100
+        quantum: 100
diff --git a/test/testdata/charts/config-split-running-tasks.yaml b/test/testdata/charts/config-split-running-tasks.yaml
@@ -150,3 +150,8 @@ manager:
     enable: true
   config:
     verbose: true
+    job:
+      rateLimit:
+        fillInterval: 1m
+        capacity: 100
+        quantum: 100
diff --git a/test/testdata/charts/config-v2.yaml b/test/testdata/charts/config-v2.yaml
@@ -25,6 +25,11 @@ manager:
     enable: true
   config:
     verbose: true
+    job:
+      rateLimit:
+        fillInterval: 1m
+        capacity: 100
+        quantum: 100
 
 scheduler:
   image:

diff --git a/test/testdata/charts/config-write-buffer-size.yaml b/test/testdata/charts/config-write-buffer-size.yaml
@@ -153,6 +153,11 @@ manager:
     enable: true
   config:
     verbose: true
+    job:
+      rateLimit:
+        fillInterval: 1m
+        capacity: 100
+        quantum: 100
 
 containerRuntime:
   containerd:

diff --git a/test/testdata/charts/config.yaml b/test/testdata/charts/config.yaml
@@ -149,6 +149,11 @@ manager:
     enable: true
   config:
     verbose: true
+    job:
+      rateLimit:
+        fillInterval: 1m
+        capacity: 100
+        quantum: 100
 
 containerRuntime:
   containerd: