fix hook error

PKUHPC · Apr 28, 2024 · 4c92053 · 4c92053
1 parent ae15484
commit 4c92053
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/apps/mis-server/src/services/job.ts b/apps/mis-server/src/services/job.ts
@@ -269,15 +269,7 @@ export const jobServiceServer = plugin((server) => {
     changeJobTimeLimit: async ({ request, logger }) => {
       const { cluster, limitMinutes, jobId, operatorUserId } = request;
 
-      try {
-        await callHook("allowChangeJobTimeLimit", { cluster, limitMinutes, jobId, operatorUserId }, logger);
-      } catch (error) {
-        throw <ServiceError>{
-          code: Status.FAILED_PRECONDITION,
-          message: `The system does not allow you ${operatorUserId} to change the job`
-          + ` with cluster ${cluster} jobid ${jobId} time limit.` + error,
-        };
-      }
+      await callHook("allowChangeJobTimeLimit", { cluster, limitMinutes, jobId, operatorUserId }, logger);
 
       await server.ext.clusters.callOnOne(
         cluster,

diff --git a/apps/mis-web/src/pageComponents/job/ChangeJobTimeLimitModal.tsx b/apps/mis-web/src/pageComponents/job/ChangeJobTimeLimitModal.tsx
@@ -111,6 +111,9 @@ export const ChangeJobTimeLimitModal: React.FC<Props> = ({ open, onClose, data,
               if (e.code === "TIME_LIME_NOT_VALID") {
                 message.error(t(p("timeLimeError")));
               };
+              if (e.code === "SYSTEM_UNALLOWED") {
+                message.error(e.message);
+              }
               throw e;
             })
             .then(() => {

diff --git a/apps/mis-web/src/pages/api/job/changeJobTimeLimit.ts b/apps/mis-web/src/pages/api/job/changeJobTimeLimit.ts
@@ -52,7 +52,10 @@ export const ChangeJobTimeLimitSchema = typeboxRouteSchema({
     /** 作业未找到 */
     404: Type.Null(),
     /** 用户设置的时限错误 */
-    400: Type.Object({ code: Type.Literal("TIME_LIME_NOT_VALID") }),
+    400: Type.Object({
+      code: Type.Union([Type.Literal("TIME_LIME_NOT_VALID"), Type.Literal("SYSTEM_UNALLOWED")]),
+      message: Type.Optional(Type.String()),
+    }),
   },
 });
 
@@ -110,6 +113,10 @@ export default /* #__PURE__*/route(ChangeJobTimeLimitSchema,
       })
       .catch(handlegRPCError({
         [Status.NOT_FOUND]: () => ({ 404: null }),
+        [Status.ALREADY_EXISTS]: (e) => ({ 400: {
+          code: "SYSTEM_UNALLOWED" as const,
+          message: e.message,
+        } }),
       },
       async () => await callLog(logInfo, OperationResult.FAIL),
       ));

diff --git a/libs/hook/src/index.ts b/libs/hook/src/index.ts
@@ -53,7 +53,13 @@ export const createHookClient = (
         event: { $case: eventName, [eventName]: eventPayload },
       }).then(
         () => { logger.debug("Hook call completed"); },
-        (e) => { logger.error(e, "Error when calling hook"); },
+        (e) => {
+          logger.error(e, "Error when calling hook");
+          // 如果是修改作业时限的hook，允许抛出错误
+          if (eventName === "allowChangeJobTimeLimit") {
+            throw e;
+          }
+        },
       );
     },
   };