External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-06 08:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11945 from fosterseth/fix_create_partition_already_exists_error

Browse Source 
Handle error for create_partition
This commit is contained in:
Seth Foster
2022-03-28 18:13:29 -04:00
committed by GitHub
parent 56f51eebce 24152555c5
commit e0082f4c76
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awx/main/utils/common.py
View File

@@ -21,7 +21,7 @@ from django.core.exceptions import ObjectDoesNotExist, FieldDoesNotExist
from django.utils.dateparse import parse_datetime from django.utils.dateparse import parse_datetime
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.db import connection from django.db import connection, transaction, ProgrammingError
from django.db.models.fields.related import ForeignObjectRel, ManyToManyField from django.db.models.fields.related import ForeignObjectRel, ManyToManyField
from django.db.models.fields.related_descriptors import ForwardManyToOneDescriptor, ManyToManyDescriptor from django.db.models.fields.related_descriptors import ForwardManyToOneDescriptor, ManyToManyDescriptor
from django.db.models.query import QuerySet from django.db.models.query import QuerySet
@@ -1141,12 +1141,16 @@ def create_partition(tblname, start=None, end=None, partition_label=None, minute
else: else:
partition_label = start.strftime('%Y%m%d_%H') partition_label = start.strftime('%Y%m%d_%H')
with connection.cursor() as cursor: try:
cursor.execute( with transaction.atomic():
f'CREATE TABLE IF NOT EXISTS {tblname}_{partition_label} ' with connection.cursor() as cursor:
f'PARTITION OF {tblname} ' cursor.execute(
f'FOR VALUES FROM (\'{start_timestamp}\') to (\'{end_timestamp}\');' f'CREATE TABLE IF NOT EXISTS {tblname}_{partition_label} '
) f'PARTITION OF {tblname} '
f'FOR VALUES FROM (\'{start_timestamp}\') to (\'{end_timestamp}\');'
)
except ProgrammingError as e:
logger.debug(f'Caught known error due to existing partition: {e}')
def cleanup_new_process(func): def cleanup_new_process(func):