Added canceled_on field to unified_jobs model #5610

thedoubl3j · 2020-01-08T17:49:31Z

When a job is canceled, the canceled_on field will populate with date/time
related Jobs canceled before starting should not show a "finished" time #3988

SUMMARY

Please see #5406 for previous comments/discussion about the decisions made.

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

API

AWX VERSION

awx: 9.1.0

ADDITIONAL INFORMATION

Before, this would look like

"scm_type": "git",
"scm_url": "https://github.com/ansible/test-playbooks.git",
"scm_branch": "",
"scm_clean": false,
"scm_delete_on_update": false,
"credential": null,
"timeout": 0,
"unified_job_template": 3838,
"launch_type": "manual",
"status": "canceled",
"failed": true,
"started": null,
"finished": "2019-06-03T12:39:05.272329Z",
"elapsed": 0.0,
"job_args": "",
"job_cwd": "",
"job_env": {},
"job_explanation": "",
"execution_node": "",
"result_traceback": "",
"event_processing_finished": true,
"project": 3838,
"job_type": "check",

With this addition, a new field is added called canceled_on that displays the timestamp that the job was canceled based on the cancel_flag.

So it now will display something like

"created": "2020-01-07T19:37:08.997962Z",
            "modified": "2020-01-07T19:37:09.325185Z",
            "name": "test",
            "description": "",
            "unified_job_template": 9,
            "launch_type": "relaunch",
            "status": "failed",
            "failed": true,
            "started": "2020-01-07T19:37:09.491372Z",
            "finished": "2020-01-07T19:48:25.446239Z",
            "canceled_on": "2020-01-07T19:55:01.833860Z",
            "elapsed": 675.955,
            "job_explanation": "Task was marked as running in Tower but was not present in the job queue, so it has been marked as failed.",
            "execution_node": "awx",

thedoubl3j · 2020-01-08T17:50:55Z

a big thanks again to @rooftopcellist @beeankha and @rebeccahhh for the help provided.

ryanpetrello · 2020-01-08T17:52:37Z

awx/main/models/unified_jobs.py

@@ -810,11 +817,18 @@ def save(self, *args, **kwargs):

        # Sanity check: Has the job just completed? If so, mark down its
        # completion time, and record its output to the database.
+        #import sdb


Let's remove this.

ryanpetrello

This seems pretty reasonable to me.

@mabashian @jakemcdermott can you think of anything we might want to do with this in the UI?

softwarefactory-project-zuul · 2020-01-08T18:05:44Z

Build failed.

awx-api-lint : SUCCESS in 3m 11s
awx-api : FAILURE in 14m 25s
awx-ui : SUCCESS in 5m 34s
awx-ui-next : SUCCESS in 15m 16s
awx-swagger : FAILURE in 10m 30s
awx-detect-schema-change : FAILURE in 15m 45s (non-voting)
awx-ansible-modules : SUCCESS in 4m 29s

thedoubl3j · 2020-01-08T19:03:51Z

I actually have a problem with it @ryanpetrello because this...is wrong

softwarefactory-project-zuul · 2020-01-08T20:43:07Z

Build failed.

awx-api-lint : SUCCESS in 3m 21s
awx-api : FAILURE in 12m 22s
awx-ui : SUCCESS in 5m 31s
awx-ui-next : SUCCESS in 12m 02s
awx-swagger : FAILURE in 9m 57s
awx-detect-schema-change : FAILURE in 10m 12s (non-voting)
awx-ansible-modules : SUCCESS in 3m 48s

awx/main/models/unified_jobs.py

AlanCoding

I love how simple this is. It needs to be in the serializer, but if it's easier to remove it from the summary_fields data to get tests passing, I would not object to that.

ryanpetrello

It looks like Alan has some minor feedback, but this looks great 🎉

Thanks @thedoubl3j !

AlanCoding · 2020-01-09T18:34:56Z

My comments were only suggestions to get the test passing, that's the only blocker

awx/main/migrations/0101_v370_unifiedjob_canceled.py

thedoubl3j · 2020-01-10T21:10:06Z

@AlanCoding so what do you think the next steps are? anything else we should add/remove/change?

softwarefactory-project-zuul · 2020-01-10T21:31:09Z

Build failed.

awx-api-lint : SUCCESS in 3m 41s
awx-api : FAILURE in 2m 14s
awx-ui : SUCCESS in 4m 17s
awx-ui-next : SUCCESS in 7m 44s
awx-swagger : FAILURE in 2m 56s
awx-detect-schema-change : FAILURE in 2m 14s (non-voting)
awx-ansible-modules : FAILURE in 2m 23s

AlanCoding · 2020-01-12T14:46:17Z

I think you need to rebase to get tests passing

softwarefactory-project-zuul · 2020-01-14T03:17:39Z

Build failed.

awx-api-lint : SUCCESS in 3m 56s
awx-api : FAILURE in 9m 36s
awx-ui : SUCCESS in 5m 52s
awx-ui-next : SUCCESS in 9m 10s
awx-swagger : SUCCESS in 10m 38s
awx-detect-schema-change : FAILURE in 10m 51s (non-voting)
awx-ansible-modules : SUCCESS in 4m 52s

- When a job is canceled, the canceled_on field will populate with date/time

softwarefactory-project-zuul · 2020-01-14T21:13:26Z

Build succeeded.

awx-api-lint : SUCCESS in 3m 12s
awx-api : SUCCESS in 11m 08s
awx-ui : SUCCESS in 4m 43s
awx-ui-next : SUCCESS in 8m 04s
awx-swagger : SUCCESS in 11m 46s
awx-detect-schema-change : FAILURE in 11m 29s (non-voting)
awx-ansible-modules : SUCCESS in 3m 32s

softwarefactory-project-zuul · 2020-01-14T21:35:09Z

Build succeeded (gate pipeline).

awx-api-lint : SUCCESS in 3m 00s
awx-api : SUCCESS in 9m 32s
awx-ui : SUCCESS in 4m 57s
awx-ui-next : SUCCESS in 8m 25s
awx-swagger : SUCCESS in 10m 57s
awx-detect-schema-change : FAILURE in 9m 14s (non-voting)
awx-ansible-modules : SUCCESS in 3m 25s
awx-push-new-schema : SUCCESS in 9m 32s (non-voting)

thedoubl3j requested review from AlanCoding and ryanpetrello January 8, 2020 17:49

ryanpetrello reviewed Jan 8, 2020

View reviewed changes

awxbot added type:bug component:api labels Jan 8, 2020

thedoubl3j requested a review from ryanpetrello January 8, 2020 20:30

AlanCoding reviewed Jan 8, 2020

View reviewed changes

awx/main/models/unified_jobs.py Outdated Show resolved Hide resolved

AlanCoding approved these changes Jan 8, 2020

View reviewed changes

ryanpetrello approved these changes Jan 9, 2020

View reviewed changes

AlanCoding reviewed Jan 10, 2020

View reviewed changes

awx/main/migrations/0101_v370_unifiedjob_canceled.py Outdated Show resolved Hide resolved

thedoubl3j and others added 2 commits January 14, 2020 15:56

Added canceled_on field to unified_jobs model

d72896f

- When a job is canceled, the canceled_on field will populate with date/time

renumber migrations correctly

79b8e6b

ryanpetrello added the mergeit label Jan 14, 2020

softwarefactory-project-zuul bot merged commit 78e2cd7 into ansible:devel Jan 14, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added canceled_on field to unified_jobs model #5610

Added canceled_on field to unified_jobs model #5610

thedoubl3j commented Jan 8, 2020

thedoubl3j commented Jan 8, 2020

ryanpetrello Jan 8, 2020

ryanpetrello left a comment

softwarefactory-project-zuul bot commented Jan 8, 2020

thedoubl3j commented Jan 8, 2020 •

edited

Loading

softwarefactory-project-zuul bot commented Jan 8, 2020

AlanCoding left a comment

ryanpetrello left a comment

AlanCoding commented Jan 9, 2020

thedoubl3j commented Jan 10, 2020

softwarefactory-project-zuul bot commented Jan 10, 2020

AlanCoding commented Jan 12, 2020

softwarefactory-project-zuul bot commented Jan 14, 2020

softwarefactory-project-zuul bot commented Jan 14, 2020

softwarefactory-project-zuul bot commented Jan 14, 2020

Added canceled_on field to unified_jobs model #5610

Added canceled_on field to unified_jobs model #5610

Conversation

thedoubl3j commented Jan 8, 2020

SUMMARY

ISSUE TYPE

COMPONENT NAME

AWX VERSION

ADDITIONAL INFORMATION

thedoubl3j commented Jan 8, 2020

ryanpetrello Jan 8, 2020

Choose a reason for hiding this comment

ryanpetrello left a comment

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Jan 8, 2020

thedoubl3j commented Jan 8, 2020 • edited Loading

softwarefactory-project-zuul bot commented Jan 8, 2020

AlanCoding left a comment

Choose a reason for hiding this comment

ryanpetrello left a comment

Choose a reason for hiding this comment

AlanCoding commented Jan 9, 2020

thedoubl3j commented Jan 10, 2020

softwarefactory-project-zuul bot commented Jan 10, 2020

AlanCoding commented Jan 12, 2020

softwarefactory-project-zuul bot commented Jan 14, 2020

softwarefactory-project-zuul bot commented Jan 14, 2020

softwarefactory-project-zuul bot commented Jan 14, 2020

thedoubl3j commented Jan 8, 2020 •

edited

Loading