From 8d4425f056a9e90b1ed8d54850f61074ed2928ac Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Thu, 2 Jan 2020 09:08:51 -0500
Subject: [PATCH] Revert "Reduce API response times by caching migration flag"

This reverts commit 5433af6716dd82cf206a7ebec8b9d6e0a4592889.
---
 awx/main/apps.py       |  9 ---------
 awx/main/middleware.py | 14 +++++---------
 awx/main/tasks.py      |  6 ------
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/awx/main/apps.py b/awx/main/apps.py
index 3f7704f2e6..b45b3c20f2 100644
--- a/awx/main/apps.py
+++ b/awx/main/apps.py
@@ -1,17 +1,8 @@
 from django.apps import AppConfig
-from django.db.models.signals import pre_migrate
 from django.utils.translation import ugettext_lazy as _
 
 
-def raise_migration_flag(**kwargs):
-    from awx.main.tasks import set_migration_flag
-    set_migration_flag.delay()
-
-
 class MainConfig(AppConfig):
 
     name = 'awx.main'
     verbose_name = _('Main')
-
-    def ready(self):
-        pre_migrate.connect(raise_migration_flag, sender=self)
diff --git a/awx/main/middleware.py b/awx/main/middleware.py
index 3f9c7de56d..b1a03c9a38 100644
--- a/awx/main/middleware.py
+++ b/awx/main/middleware.py
@@ -18,7 +18,6 @@ from django.db import IntegrityError, connection
 from django.utils.functional import curry
 from django.shortcuts import get_object_or_404, redirect
 from django.apps import apps
-from django.core.cache import cache
 from django.utils.deprecation import MiddlewareMixin
 from django.utils.translation import ugettext_lazy as _
 from django.urls import reverse, resolve
@@ -214,11 +213,8 @@ class URLModificationMiddleware(MiddlewareMixin):
 class MigrationRanCheckMiddleware(MiddlewareMixin):
 
     def process_request(self, request):
-        if cache.get('migration_in_progress', False):
-            executor = MigrationExecutor(connection)
-            plan = executor.migration_plan(executor.loader.graph.leaf_nodes())
-            if not bool(plan):
-                logger.info('Detected that migration finished, migration page taken down.')
-                cache.delete('migration_in_progress')
-            elif getattr(resolve(request.path), 'url_name', '') != 'migrations_notran':
-                return redirect(reverse("ui:migrations_notran"))
+        executor = MigrationExecutor(connection)
+        plan = executor.migration_plan(executor.loader.graph.leaf_nodes())
+        if bool(plan) and \
+                getattr(resolve(request.path), 'url_name', '') != 'migrations_notran':
+            return redirect(reverse("ui:migrations_notran"))
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 7fabe6308d..9b263f550d 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -263,12 +263,6 @@ def apply_cluster_membership_policies():
         logger.debug('Cluster policy computation finished in {} seconds'.format(time.time() - started_compute))
 
 
-@task(queue='tower_broadcast_all', exchange_type='fanout')
-def set_migration_flag():
-    logger.debug('Received migration-in-progress signal, will serve redirect.')
-    cache.set('migration_in_progress', True)
-
-
 @task(queue='tower_broadcast_all', exchange_type='fanout')
 def handle_setting_changes(setting_keys):
     orig_len = len(setting_keys)