Pass update_all_types=True to put_mapping on ES2 - workaround for #2968

wagtail · Oct 5, 2016 · b4a4e5e · b4a4e5e
1 parent 882facf
commit b4a4e5e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/tox.ini b/tox.ini
@@ -29,6 +29,7 @@ deps =
     dj110head: git+https://github.com/django/django.git@stable/1.10.x#egg=Django
     postgres: psycopg2>=2.6
     mysql: mysqlclient==1.3.6
+    elasticsearch: elasticsearch>=1,<2
     elasticsearch2: elasticsearch>=2,<3
 
 setenv =

diff --git a/wagtail/wagtailsearch/backends/elasticsearch2.py b/wagtail/wagtailsearch/backends/elasticsearch2.py
@@ -102,7 +102,17 @@ def get_document(self, obj):
 
 
 class Elasticsearch2Index(ElasticsearchIndex):
-    pass
+    def add_model(self, model):
+        # Get mapping
+        mapping = self.mapping_class(model)
+
+        # Put mapping
+        self.es.indices.put_mapping(
+            # pass update_all_types=True as a workaround to avoid "Can't redefine search field" errors -
+            # see https://github.com/torchbox/wagtail/issues/2968
+            index=self.name, doc_type=mapping.get_document_type(), body=mapping.get_mapping(),
+            update_all_types=True
+        )
 
 
 class Elasticsearch2SearchQuery(ElasticsearchSearchQuery):