fix: createPriceMap时不使用callOnAll, 适配器连接异常时也显示启用按键

PKUHPC · Jul 15, 2024 · 6b159ac · 6b159ac
1 parent dbebe7f
commit 6b159ac
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/apps/mis-server/src/bl/PriceMap.ts b/apps/mis-server/src/bl/PriceMap.ts
@@ -89,24 +89,30 @@ export async function createPriceMap(
     return price;
   };
 
-  // partitions info for all clusters
-  const partitionsForClusters: Record<string, Partition[]> = {};
+
 
   // call for all activated clusters
   const activatedClusters = await getActivatedClusters(em, logger).catch((e) => {
     logger.info("!!![important] No available activated clusters.This will skip creating price map in cluster!!!");
     logger.info(e);
     return {};
   });
-  const reply = await clusterPlugin.callOnAll(
-    activatedClusters,
-    logger,
-    async (client) => await asyncClientCall(client.config, "getClusterConfig", {}),
-  );
 
-  reply.forEach((x) => {
-    partitionsForClusters[x.cluster] = x.result.partitions;
-  });
+  // partitions info for all clusters
+  const partitionsForClusters: Record<string, Partition[]> = {};
+
+  await Promise.allSettled(Object.keys(activatedClusters).map(async (cluster) => {
+    try {
+      const result = await clusterPlugin.callOnOne(
+        cluster,
+        logger,
+        async (client) => await asyncClientCall(client.config, "getClusterConfig", {}),      
+      );
+      partitionsForClusters[cluster] = result.partitions;
+    } catch (error) { 
+      logger.info(`Can not get cluster's (clusterId: ${cluster}) config info from adapter.`, error);
+    };
+  }));
 
   return {
 

diff --git a/apps/mis-server/src/tasks/fetch.ts b/apps/mis-server/src/tasks/fetch.ts
@@ -84,7 +84,7 @@ export async function fetchJobs(
         logger.info("!!![important] No available activated clusters.This will skip fetching Jobs in cluster!!!");
         logger.info(e);
         return {};
-      }); ;
+      });
 
       // Calculate prices for new info and persist
       const pricedJobs: JobInfo[] = [];

diff --git a/apps/mis-web/src/pageComponents/admin/ClusterManagementTable.tsx b/apps/mis-web/src/pageComponents/admin/ClusterManagementTable.tsx
@@ -188,7 +188,6 @@ export const ClusterManagementTable: React.FC<Props> = ({
                 }
                 {
                   r.hpcEnabled && r.activationStatus === ClusterActivationStatus.DEACTIVATED
-                && r.connectionStatus === ClusterConnectionStatus.AVAILABLE
                   && (
                     <>
                       <a onClick={() => {