From 493e6cc5273e4456bac50fa8b8779234b74b4a4b Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Fri, 18 Jun 2021 10:40:14 -0400 Subject: [PATCH] Make the isolated removal migration non-atomic We are apparently running into problems with pending triggers under some circumstances. --- awx/main/migrations/0139_isolated_removal.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/awx/main/migrations/0139_isolated_removal.py b/awx/main/migrations/0139_isolated_removal.py index dc8b163008..0db16b6348 100644 --- a/awx/main/migrations/0139_isolated_removal.py +++ b/awx/main/migrations/0139_isolated_removal.py @@ -1,19 +1,22 @@ # Generated by Django 2.2.16 on 2021-04-21 15:02 -from django.db import migrations, models +from django.db import migrations, models, transaction def remove_iso_instances(apps, schema_editor): Instance = apps.get_model('main', 'Instance') - Instance.objects.filter(rampart_groups__controller__isnull=False).delete() + with transaction.atomic(): + Instance.objects.filter(rampart_groups__controller__isnull=False).delete() def remove_iso_groups(apps, schema_editor): InstanceGroup = apps.get_model('main', 'InstanceGroup') - InstanceGroup.objects.filter(controller__isnull=False).delete() + with transaction.atomic(): + InstanceGroup.objects.filter(controller__isnull=False).delete() class Migration(migrations.Migration): + atomic = False dependencies = [ ('main', '0138_custom_inventory_scripts_removal'),