allow elastic index to be recreated from admin page (bug 713210)

Author: cvan

apps/amo/tests/__init__.py

@@ -373,6 +373,12 @@ def tearDownClass(cls):
     def refresh(cls, index='default'):
         cls.es.refresh(settings.ES_INDEXES[index], timesleep=0)
 
+    @classmethod
+    def reindex(cls, model):
+        # Emit post-save signal so all of the objects get reindexed.
+        [o.save() for o in model.objects.all()]
+        cls.refresh()
+
     @classmethod
     def add_addons(cls):
         addon_factory(name='user-disabled', disabled_by_user=True)

apps/zadmin/templates/zadmin/elastic.html

@@ -2,6 +2,10 @@
 
 {% block title %}Elastic Search {{ super() }}{% endblock %}
 
+{% block extrahead %}
+<style>form { margin-bottom: 1em }</style>
+{% endblock %}
+
 {% block content %}
 <ul>
   <li><a href="#mapping">Mappings</a></li>
@@ -12,8 +16,7 @@
 <h3 id="mapping">Mappings</h3>
 <form method="post" action="">
   {{ csrf() }}
-  <input name="reset" placeholder="mapping name">
-  <button>Reset</button>
+  <button name="recreate" value="1">Recreate {{ index }} index</button>
 </form>
 <form method="post" action="">
   {{ csrf() }}

apps/zadmin/tests/test_views.py

@@ -1672,16 +1672,16 @@ def test_non_default_version(self):
                        app=self.app, app_version=app_version)
 
     def test_minor_versions(self):
-       addon = self.populate()
-       self.generate_reports(addon, good=0, bad=1, app=self.app,
-                             app_version=self.app_version)
-       self.generate_reports(addon, good=1, bad=2, app=self.app,
-                             app_version=self.app_version + 'a2')
+        addon = self.populate()
+        self.generate_reports(addon, good=0, bad=1, app=self.app,
+                              app_version=self.app_version)
+        self.generate_reports(addon, good=1, bad=2, app=self.app,
+                              app_version=self.app_version + 'a2')
 
-       tr = self.get_pq(ratio=0.0, minimum=0).find('tr[data-guid="%s"]' %
-                                                   addon.guid)
-       self.check_row(tr, addon, good=1, bad=3, percentage='75.0',
-                      app=self.app, app_version=self.app_version)
+        tr = self.get_pq(ratio=0.0, minimum=0).find('tr[data-guid="%s"]' %
+                                                    addon.guid)
+        self.check_row(tr, addon, good=1, bad=3, percentage='75.0',
+                       app=self.app, app_version=self.app_version)
 
     def test_ratio(self):
         addon = self.populate()
@@ -1737,6 +1737,34 @@ def test_cant_clear(self):
         eq_(cache.get('foo'), 'bar')
 
 
+class TestElastic(amo.tests.ESTestCase):
+    fixtures = ['base/addon_3615', 'base/users']
+
+    def setUp(self):
+        self.url = reverse('zadmin.elastic')
+        self.client.login(username='admin@mozilla.com', password='password')
+
+    def test_login(self):
+        self.client.logout()
+        self.assertRedirects(self.client.get(self.url),
+            reverse('users.login') + '?to=/en-US/admin/elastic')
+
+    @mock.patch('zadmin.views.elasticutils')
+    @mock.patch('zadmin.views.addons.search')
+    def test_recreate_index(self, search, es):
+        self.client.post(self.url, {'recreate': 1})
+        index = settings.ES_INDEXES['default']
+        index in es.get_es().delete_index_if_exists.call_args_list[0][0]
+        assert search.setup_mapping.called
+        index in es.get_es().create_index_if_missing.call_args_list[0][0]
+
+    def test_reindex_addons(self):
+        eq_(list(Addon.search()), [])
+        self.client.post(self.url, {'reindex': 'addons'})
+        self.refresh()
+        eq_(list(Addon.search()), list(Addon.objects.all()))
+
+
 class TestEmailDevs(amo.tests.TestCase):
     fixtures = ['base/addon_3615', 'base/users']
 

apps/zadmin/views.py

@@ -531,30 +531,30 @@ def monthly_pick(request):
 def elastic(request):
     INDEX = site_settings.ES_INDEXES['default']
     es = elasticutils.get_es()
-    mappings = {'addons': (addons.search.setup_mapping,
-                           addons.cron.reindex_addons),
-                'collections': (addons.search.setup_mapping,
-                                bandwagon.cron.reindex_collections),
-                'compat': (addons.search.setup_mapping, None),
-                'users': (addons.search.setup_mapping,
-                          users.cron.reindex_users),
+    mappings = {'addons': addons.cron.reindex_addons,
+                'collections': bandwagon.cron.reindex_collections,
+                'compat': None,
+                'users': users.cron.reindex_users,
                }
     if request.method == 'POST':
-        if request.POST.get('reset') in mappings:
-            name = request.POST['reset']
-            es.delete_mapping(INDEX, name)
-            if mappings[name][0]:
-                mappings[name][0]()
-            messages.info(request, 'Resetting %s.' % name)
+        if request.POST.get('recreate'):
+            es.delete_index_if_exists(INDEX)
+            # We must set up the mappings before we create the index again.
+            addons.search.setup_mapping()
+            es.create_index_if_missing(INDEX)
+            messages.info(request, 'Deleting %s index.' % INDEX)
         if request.POST.get('reindex') in mappings:
             name = request.POST['reindex']
-            mappings[name][1]()
+            # Reindex.
+            if mappings.get(name):
+                mappings[name]()
             messages.info(request, 'Reindexing %s.' % name)
         return redirect('zadmin.elastic')
 
     indexes = set(site_settings.ES_INDEXES.values())
     mappings = es.get_mapping(None, indexes)
     ctx = {
+        'index': INDEX,
         'nodes': es.cluster_nodes(),
         'health': es.cluster_health(),
         'state': es.cluster_state(),