fix(platform-server): mysql username env and job timeout env

perfsee · Nov 1, 2022 · 5a23a16 · 5a23a16
1 parent 677b335
commit 5a23a16
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/packages/platform-server/.env.example b/packages/platform-server/.env.example
@@ -14,7 +14,7 @@ MYSQL_URL=mysql://root@127.0.0.1:3306/perfsee
 # or
 MYSQL_PORT=3306
 MYSQL_HOST=127.0.0.1
-MYSQL_NAME=root
+MYSQL_USERNAME=root
 MYSQL_PASSWORD=
 MYSQL_DB=perfsee
 
@@ -37,6 +37,7 @@ GITHUB_APP_PRIVATE_KEY_FILE=
 JOB_POLLING_LIMIT=10
 JOB_POLLING_QUEUE_LIMIT=10
 JOB_POLLING_TIMEOUT_SEC=3
+JOB_TIMEOUT_SEC=1800
 
 # EMAIL
 EMAIL_SMTP_HOST=

diff --git a/packages/platform-server/src/config/def.ts b/packages/platform-server/src/config/def.ts
@@ -267,6 +267,10 @@ export interface PerfseeConfig {
      * timeout for job pulling requests
      */
     pollingTimeoutSec: number
+    /**
+     * timeout for job execution
+     */
+    executionTimeoutSec: number
     /**
      * default job zone
      */

diff --git a/packages/platform-server/src/config/default.ts b/packages/platform-server/src/config/default.ts
@@ -86,6 +86,7 @@ export const getDefaultPerfseeConfig: () => PerfseeConfig = () => ({
     pollingLimit: 10,
     pollingQueueLimit: 10,
     pollingTimeoutSec: 5,
+    executionTimeoutSec: 1800,
     defaultZone: 'China',
     zones: ['China'],
   },

diff --git a/...ages/platform-server/src/modules/job/__tests__/__snapshots__/job.spec.e2e.ts.md b/...ages/platform-server/src/modules/job/__tests__/__snapshots__/job.spec.e2e.ts.md
@@ -15,6 +15,7 @@ Generated by [AVA](https://avajs.dev).
         artifactId: 1,
         buildKey: 'test-build-key.tar',
       },
+      timeout: 1800,
     }
 
 ## should successfully update trace

diff --git a/packages/platform-server/src/modules/job/__tests__/__snapshots__/job.spec.e2e.ts.snap b/packages/platform-server/src/modules/job/__tests__/__snapshots__/job.spec.e2e.ts.snap
diff --git a/packages/platform-server/src/modules/job/controller.ts b/packages/platform-server/src/modules/job/controller.ts
@@ -122,6 +122,7 @@ export class JobController {
         job: {
           jobId: job.id,
           jobType: job.jobType,
+          timeout: this.config.job.executionTimeoutSec,
           payload,
         },
         set: runnerUpdates,

diff --git a/packages/platform-server/src/perfsee.config.ts b/packages/platform-server/src/perfsee.config.ts
@@ -143,17 +143,17 @@ perfsee.project.externalProviders = ['github']
 // ##                   8. Job settings                         ##
 // ###############################################################
 // # maximum job pulling requests per instance can handle concurrently
-// # `process.env.JOB_POLLING_LIMIT` if set
 // perfsee.job.pollingLimit = 10
 
 // # maximum job pulling requests in queue per instance, if reach polling limit
-// # `process.env.JOB_POLLING_QUEUE_LIMIT` if set
 // perfsee.job.pollingQueueLimit = 10
 
 // # timeout for job pulling requests
-// # `process.env.JOB_POLLING_TIMEOUT` if set
 // perfsee.job.pollingTimeoutSec = 5
 
+// # timeout for job execution
+// perfsee.job.executionTimeoutSec = 30 * 60
+
 // ###############################################################
 // ##                  9. Runner settings                       ##
 // ###############################################################