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

Merge pull request #9142 from ryanpetrello/bye-bigint

Browse Source 
stop detecting the need for event data migration

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-01-22 18:46:13 +00:00
committed by GitHub
parent 3e03c726cb 16848e9154
commit b913d8411a
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/models/__init__.py
View File

@@ -81,10 +81,17 @@ User.add_to_class('accessible_objects', user_accessible_objects)
def enforce_bigint_pk_migration(): def enforce_bigint_pk_migration():
#
# NOTE: this function is not actually in use anymore,
# but has been intentionally kept for historical purposes,
# and to serve as an illustration if we ever need to perform
# bulk modification/migration of event data in the future.
#
# see: https://github.com/ansible/awx/issues/6010 # see: https://github.com/ansible/awx/issues/6010
# look at all the event tables and verify that they have been fully migrated # look at all the event tables and verify that they have been fully migrated
# from the *old* int primary key table to the replacement bigint table # from the *old* int primary key table to the replacement bigint table
# if not, attempt to migrate them in the background # if not, attempt to migrate them in the background
#
for tblname in ( for tblname in (
'main_jobevent', 'main_inventoryupdateevent', 'main_jobevent', 'main_inventoryupdateevent',
'main_projectupdateevent', 'main_adhoccommandevent', 'main_projectupdateevent', 'main_adhoccommandevent',

14
awx/main/tasks.py
View File

@@ -60,7 +60,7 @@ from awx.main.models import (
Inventory, InventorySource, SmartInventoryMembership, Inventory, InventorySource, SmartInventoryMembership,
Job, AdHocCommand, ProjectUpdate, InventoryUpdate, SystemJob, Job, AdHocCommand, ProjectUpdate, InventoryUpdate, SystemJob,
JobEvent, ProjectUpdateEvent, InventoryUpdateEvent, AdHocCommandEvent, SystemJobEvent, JobEvent, ProjectUpdateEvent, InventoryUpdateEvent, AdHocCommandEvent, SystemJobEvent,
build_safe_env, enforce_bigint_pk_migration build_safe_env
) )
from awx.main.constants import ACTIVE_STATES from awx.main.constants import ACTIVE_STATES
from awx.main.exceptions import AwxTaskError, PostRunError from awx.main.exceptions import AwxTaskError, PostRunError
@@ -138,12 +138,6 @@ def dispatch_startup():
if Instance.objects.me().is_controller(): if Instance.objects.me().is_controller():
awx_isolated_heartbeat() awx_isolated_heartbeat()
# at process startup, detect the need to migrate old event records from int
# to bigint; at *some point* in the future, once certain versions of AWX
# and Tower fall out of use/support, we can probably just _assume_ that
# everybody has moved to bigint, and remove this code entirely
enforce_bigint_pk_migration()
# Update Tower's rsyslog.conf file based on loggins settings in the db # Update Tower's rsyslog.conf file based on loggins settings in the db
reconfigure_rsyslog() reconfigure_rsyslog()
@@ -738,6 +732,12 @@ def update_host_smart_inventory_memberships():
@task(queue=get_local_queuename) @task(queue=get_local_queuename)
def migrate_legacy_event_data(tblname): def migrate_legacy_event_data(tblname):
#
# NOTE: this function is not actually in use anymore,
# but has been intentionally kept for historical purposes,
# and to serve as an illustration if we ever need to perform
# bulk modification/migration of event data in the future.
#
if 'event' not in tblname: if 'event' not in tblname:
return return
with advisory_lock(f'bigint_migration_{tblname}', wait=False) as acquired: with advisory_lock(f'bigint_migration_{tblname}', wait=False) as acquired: