From 8fee8fcab2b8ab92c39951a06517b005591d879d Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 3 Jul 2023 09:37:25 +0200 Subject: [PATCH] Revert check for null in concurrent job list --- web/frontend/src/Job.root.svelte | 450 ++++++++++++++++++++----------- 1 file changed, 300 insertions(+), 150 deletions(-) diff --git a/web/frontend/src/Job.root.svelte b/web/frontend/src/Job.root.svelte index 3d8e58e..2ec1ade 100644 --- a/web/frontend/src/Job.root.svelte +++ b/web/frontend/src/Job.root.svelte @@ -1,21 +1,37 @@ -
+
{#if $initq.error} {$initq.error.message} {:else if $initq.data} - + {:else} - + {/if} {#if $jobMetrics.data && $initq.data} - {#if $initq.data.job.concurrentJobs.items.length != 0} + {#if $initq.data.job.concurrentJobs != null && $initq.data.job.concurrentJobs.items.length != 0} {#if authlevel > roles.manager} -
Concurrent Jobs
+
+ Concurrent Jobs +
    -
  • See All
  • - {#each $initq.data.job.concurrentJobs.items as pjob, index} -
  • {pjob.jobId}
  • - {/each} +
  • + See All +
  • + {#each $initq.data.job.concurrentJobs.items as pjob, index} +
  • + {pjob.jobId} +
  • + {/each}
{:else} -
{$initq.data.job.concurrentJobs.items.length} Concurrent Jobs
-

Number of shared jobs on the same node with overlapping runtimes.

+
+ {$initq.data.job.concurrentJobs.items.length} Concurrent + Jobs +
+

+ Number of shared jobs on the same node with overlapping + runtimes. +

{/if} {/if} + jobMetrics={$jobMetrics.data.jobMetrics} + /> c.name == $initq.data.job.cluster).subClusters - .find(sc => sc.name == $initq.data.job.subCluster)} - flopsAny={$jobMetrics.data.jobMetrics.find(m => m.name == 'flops_any' && m.scope == 'node')} - memBw={$jobMetrics.data.jobMetrics.find(m => m.name == 'mem_bw' && m.scope == 'node')} /> + .find((c) => c.name == $initq.data.job.cluster) + .subClusters.find( + (sc) => sc.name == $initq.data.job.subCluster + )} + flopsAny={$jobMetrics.data.jobMetrics.find( + (m) => m.name == "flops_any" && m.scope == "node" + )} + memBw={$jobMetrics.data.jobMetrics.find( + (m) => m.name == "mem_bw" && m.scope == "node" + )} + /> {:else} - - + + {/if}
-
+
{#if $initq.data} - + {/if} {#if $initq.data} - {/if} @@ -176,97 +283,139 @@ -
+
{#if $jobMetrics.error} {#if $initq.data.job.monitoringStatus == 0 || $initq.data.job.monitoringStatus == 2} - Not monitored or archiving failed -
+ Not monitored or archiving failed +
{/if} {$jobMetrics.error.message} {:else if $jobMetrics.fetching} - + {:else if $jobMetrics.data && $initq.data} + items={orderAndMap( + groupByScope($jobMetrics.data.jobMetrics), + selectedMetrics + )} + itemsPerRow={ccconfig.plot_view_plotsPerRow} + > {#if item.data} statsTable.moreLoaded(detail)} + on:more-loaded={({ detail }) => + statsTable.moreLoaded(detail)} job={$initq.data.job} metricName={item.metric} - rawData={item.data.map(x => x.metric)} - scopes={item.data.map(x => x.scope)} - width={width} - isShared={($initq.data.job.exclusive != 1)}/> + rawData={item.data.map((x) => x.metric)} + scopes={item.data.map((x) => x.scope)} + {width} + isShared={$initq.data.job.exclusive != 1} + /> {:else} - No dataset returned for {item.metric} + No dataset returned for {item.metric} {/if} {/if}
-
+
{#if $initq.data} - - {#if somethingMissing} - -
- - Missing Metrics/Reseources - - - {#if missingMetrics.length > 0} -

No data at all is available for the metrics: {missingMetrics.join(', ')}

- {/if} - {#if missingHosts.length > 0} -

Some metrics are missing for the following hosts:

-
    - {#each missingHosts as missing} -
  • {missing.hostname}: {missing.metrics.join(', ')}
  • - {/each} -
- {/if} -
-
-
- {/if} - - {#if $jobMetrics.data} - {#key $jobMetrics.data} - - {/key} + + {#if somethingMissing} + +
+ + + Missing Metrics/Reseources + + + {#if missingMetrics.length > 0} +

+ No data at all is available for the + metrics: {missingMetrics.join(", ")} +

+ {/if} + {#if missingHosts.length > 0} +

+ Some metrics are missing for the + following hosts: +

+
    + {#each missingHosts as missing} +
  • + {missing.hostname}: {missing.metrics.join( + ", " + )} +
  • + {/each} +
+ {/if} +
+
+
+
{/if} -
- -
- {#if $initq.data.job.metaData?.jobScript} -
{$initq.data.job.metaData?.jobScript}
- {:else} - No job script available + + {#if $jobMetrics.data} + {#key $jobMetrics.data} + + {/key} {/if} -
-
- -
- {#if $initq.data.job.metaData?.slurmInfo} -
{$initq.data.job.metaData?.slurmInfo}
- {:else} - No additional slurm information available - {/if} -
-
-
+ + +
+ {#if $initq.data.job.metaData?.jobScript} +
{$initq.data.job.metaData?.jobScript}
+ {:else} + No job script available + {/if} +
+
+ +
+ {#if $initq.data.job.metaData?.slurmInfo} +
{$initq.data.job.metaData?.slurmInfo}
+ {:else} + No additional slurm information available + {/if} +
+
+ {/if}
@@ -276,7 +425,8 @@ cluster={$initq.data.job.cluster} configName="job_view_selectedMetrics" bind:metrics={selectedMetrics} - bind:isOpen={isMetricsSelectionOpen} /> + bind:isOpen={isMetricsSelectionOpen} + /> {/if}