Fix rule picking, job executor cancel bug (#58)

* fix #57, fix rule selection bug

* fix #56, when vertex manager is not started, _job may not set

src/JobManager/JobManager.ts

@@ -141,7 +141,7 @@ export class JobManager {
             this._job.status = JobStatus.Canceled;
             this._job.jobExecutorId = null;
             this._job = await jobRepo.save(this._job) as Job;
-            await this._vm.cancelVertices();
+            await this._vm.stop(this._job.id);
             this._jobLogger.warn('job canceled');
             this._jobLogger.info(LOG_END_FLAG);
         }
@@ -156,7 +156,7 @@ export class JobManager {
             const jobRepo = this._databaseService.getJobRepository();
             this._job.status = JobStatus.Pause;
             this._job = await jobRepo.save(this._job) as Job;
-            await this._vm.cancelVertices();
+            await this._vm.stop(this._job.id);
             this._jobLogger.info('job paused.');
             this._jobLogger.info(LOG_END_FLAG);
         }

src/JobManager/VertexManager.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 IROHA LAB
+ * Copyright 2023 IROHA LAB
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ export interface VertexManager {
     createAllVertices(job: Job): Promise<void>;
     recreateCanceledVertices(job: Job): Promise<void>;
     start(job: Job, jobLogPath: string): Promise<void>;
-    stop(): Promise<void>;
-    cancelVertices(): Promise<void>;
+    stop(jobId?: string): Promise<void>;
+    cancelVertices(jobId: string): Promise<void>;
 }
 
 export const EVENT_VERTEX_FAIL = 'vertex_fail';

src/JobManager/VertexManagerImpl.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 IROHA LAB
+ * Copyright 2023 IROHA LAB
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,10 +71,13 @@ export class VertexManagerImpl implements VertexManager {
         await this.checkAndExecuteVertexFromQueue();
     }
 
-    public async stop(): Promise<void> {
+    public async stop(jobId: string = null): Promise<void> {
         clearTimeout(this._checkQueueTimer);
-        if (this._job) {
-            await this.cancelVertices();
+        if (jobId) {
+            await this.cancelVertices(jobId);
+        } else if (this._job) {
+            // job not started yet
+            await this.cancelVertices(this._job.id);
         }
     }
 
@@ -173,9 +176,9 @@ export class VertexManagerImpl implements VertexManager {
      * cancel all running vertices, save each vertex status to VertexStatus.Canceled.
      * waiting until all vertices canceled.
      */
-    public async cancelVertices(): Promise<void> {
+    public async cancelVertices(jobId: string): Promise<void> {
         const vertexRepo = this._databaseService.getVertexRepository();
-        const vertexMap = await vertexRepo.getVertexMap(this._job.id);
+        const vertexMap = await vertexRepo.getVertexMap(jobId);
         const allPromise = [];
         Object.keys(vertexMap).forEach(vertexId => {
             const vertex = vertexMap[vertexId];

src/JobScheduler.ts

@@ -129,8 +129,11 @@ export class JobScheduler implements JobApplication {
                     }
                 }
                 if (!appliedRule) {
+                    // check all bangumi wide rule, we need to exclude video file specified rules
+                    // since checkConditionMatch will return true for any rule.condition is none
+                    // see: https://github.com/irohalab/mira-video-manager/issues/57
                     for (const rule of rules) {
-                        if (await this.checkConditionMatch(rule.condition, msg)) {
+                        if (!rule.videoFileId && await this.checkConditionMatch(rule.condition, msg)) {
                             appliedRule = rule;
                             break;
                         }