Calculate duration in UI (#23259)

* Calculate duration in UI * calculate mapped instance duration too
apache · Apr 26, 2022 · 9e2531f · 9e2531f
1 parent 511ea70
commit 9e2531f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/airflow/www/static/js/tree/InstanceTooltip.jsx b/airflow/www/static/js/tree/InstanceTooltip.jsx
@@ -27,7 +27,7 @@ import Time from './Time';
 const InstanceTooltip = ({
   group,
   instance: {
-    startDate, endDate, duration, state, runId, mappedStates,
+    startDate, endDate, state, runId, mappedStates,
   },
 }) => {
   const isGroup = !!group.children;
@@ -91,7 +91,7 @@ const InstanceTooltip = ({
       <Text>
         Duration:
         {' '}
-        {formatDuration(duration || getDuration(startDate, endDate))}
+        {formatDuration(getDuration(startDate, endDate))}
       </Text>
     </Box>
   );

diff --git a/airflow/www/static/js/tree/details/content/dagRun/index.jsx b/airflow/www/static/js/tree/details/content/dagRun/index.jsx
@@ -29,7 +29,7 @@ import { MdPlayArrow, MdOutlineAccountTree } from 'react-icons/md';
 
 import { SimpleStatus } from '../../../StatusBox';
 import { ClipboardText } from '../../../Clipboard';
-import { formatDuration } from '../../../../datetime_utils';
+import { formatDuration, getDuration } from '../../../../datetime_utils';
 import Time from '../../../Time';
 import MarkFailedRun from './MarkFailedRun';
 import MarkSuccessRun from './MarkSuccessRun';
@@ -50,7 +50,6 @@ const DagRun = ({ runId }) => {
     executionDate,
     state,
     runType,
-    duration,
     lastSchedulingDecision,
     dataIntervalStart,
     dataIntervalEnd,
@@ -103,7 +102,7 @@ const DagRun = ({ runId }) => {
       <Text>
         Duration:
         {' '}
-        {formatDuration(duration)}
+        {formatDuration(getDuration(startDate, endDate))}
       </Text>
       {lastSchedulingDecision && (
       <Text>

diff --git a/airflow/www/static/js/tree/details/content/taskInstance/Details.jsx b/airflow/www/static/js/tree/details/content/taskInstance/Details.jsx
@@ -37,7 +37,6 @@ const Details = ({ instance, group, operator }) => {
   const {
     taskId,
     runId,
-    duration,
     startDate,
     endDate,
     state,
@@ -134,7 +133,7 @@ const Details = ({ instance, group, operator }) => {
           {isOverall}
           Duration:
           {' '}
-          {formatDuration(duration || getDuration(startDate, endDate))}
+          {formatDuration(getDuration(startDate, endDate))}
         </Text>
         {startDate && (
         <Text>

diff --git a/airflow/www/static/js/tree/details/content/taskInstance/MappedInstances.jsx b/airflow/www/static/js/tree/details/content/taskInstance/MappedInstances.jsx
@@ -31,7 +31,7 @@ import {
 } from 'react-icons/md';
 
 import { getMetaValue } from '../../../../utils';
-import { formatDateTime, formatDuration } from '../../../../datetime_utils';
+import { formatDateTime, formatDuration, getDuration } from '../../../../datetime_utils';
 import { useMappedInstances } from '../../../api';
 import { SimpleStatus } from '../../../StatusBox';
 import Table from '../../../Table';
@@ -83,7 +83,7 @@ const MappedInstances = ({
             {mi.state || 'no status'}
           </Flex>
         ),
-        duration: mi.duration && formatDuration(mi.duration),
+        duration: mi.duration && formatDuration(getDuration(mi.startDate, mi.endDate)),
         startDate: mi.startDate && formatDateTime(mi.startDate),
         endDate: mi.endDate && formatDateTime(mi.endDate),
         links: (

diff --git a/airflow/www/utils.py b/airflow/www/utils.py
@@ -146,7 +146,6 @@ def encode_ti(
         'run_id': task_instance.run_id,
         'map_index': task_instance.map_index,
         'state': task_instance.state,
-        'duration': task_instance.duration,
         'start_date': datetime_to_string(task_instance.start_date),
         'end_date': datetime_to_string(task_instance.end_date),
         'try_number': try_count,