fix(server): fix billing task concurrency overflow (#1216)

labring · Jun 5, 2023 · b8cdc75 · b8cdc75
1 parent f49f44e
commit b8cdc75
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/deploy/build/charts/laf-server/templates/metering.yaml b/deploy/build/charts/laf-server/templates/metering.yaml
@@ -326,7 +326,7 @@ spec:
           env:
             - name: MONGO_URI
               value: {{ .Values.meteringDatabaseUrl | quote }}
-          image: docker.io/bxy4543/laf-resources-controller:v0.0.1
+          image: docker.io/bxy4543/laf-resources-controller:v0.0.2
           imagePullPolicy: Always
           livenessProbe:
             httpGet:

diff --git a/server/src/billing/billing-task.service.ts b/server/src/billing/billing-task.service.ts
@@ -27,7 +27,7 @@ export class BillingTaskService {
 
   constructor(private readonly billing: BillingService) {}
 
-  @Cron(CronExpression.EVERY_5_MINUTES)
+  @Cron(CronExpression.EVERY_10_MINUTES)
   async createBillingScheduler() {
     const db = SystemDatabase.db
     if (ServerConfig.DISABLED_BILLING_TASK) {
@@ -42,11 +42,11 @@ export class BillingTaskService {
         },
       })
 
-    const concurrency = total > 30 ? 30 : total
-    if (total > 30) {
+    const concurrency = total > 10 ? 10 : total
+    if (total > 10) {
       setTimeout(() => {
         this.createBillingScheduler()
-      }, 3000)
+      }, 2000)
     }
 
     times(concurrency, () => {
@@ -56,7 +56,7 @@ export class BillingTaskService {
     })
   }
 
-  @Cron(CronExpression.EVERY_SECOND)
+  @Cron(CronExpression.EVERY_10_MINUTES)
   async payBillingScheduler() {
     const db = SystemDatabase.db
     if (ServerConfig.DISABLED_BILLING_TASK) {
@@ -70,11 +70,11 @@ export class BillingTaskService {
         lockedAt: { $lt: new Date(Date.now() - 1000 * 60) },
       })
 
-    const concurrency = total > 30 ? 30 : total
-    if (total > 30) {
+    const concurrency = total > 10 ? 10 : total
+    if (total > 10) {
       setTimeout(() => {
         this.payBillingScheduler()
-      }, 3000)
+      }, 2000)
     }
 
     times(concurrency, () => {