Bump required Elasticsearch to 7.*

CHANGELOG.md

@@ -7,6 +7,7 @@
 
 ## Changed
 
+- Bumped Elasticsearch requirement to 7.\*
 - AIP creation to be done at preservation step
 - Relation between IPs and storage policies to be defined in submission agreement
 

ESSArch_Core/ip/views.py

@@ -1804,9 +1804,9 @@ def files(self, request, pk=None):
                 raise
 
             if self.paginator is not None:
-                ceil = math.ceil(results.hits.total / size)
+                ceil = math.ceil(results.hits.total['value'] / size)
                 ceil = 1 if ceil < 1 else ceil
-                if results.hits.total > 0 and number > ceil:
+                if results.hits.total['value'] > 0 and number > ceil:
                     raise exceptions.NotFound('Invalid page.')
 
             results_list = []
@@ -1827,7 +1827,7 @@ def files(self, request, pk=None):
                 results_list.append(d)
 
             if self.paginator is not None:
-                return Response(results_list, headers={'Count': results.hits.total})
+                return Response(results_list, headers={'Count': results.hits.total['value']})
 
             return Response(results_list)
 

ESSArch_Core/search/alias_migration.py

@@ -5,7 +5,6 @@
 """
 from datetime import datetime
 
-from elasticsearch_dsl import IndexTemplate
 from elasticsearch_dsl.connections import get_connection
 
 
@@ -65,9 +64,7 @@ def migrate(doctype, move_data=True, update_alias=True, delete_old_index=False):
     next_index = get_next_index(pattern)
 
     # create an index template
-    index_template = IndexTemplate(alias, pattern)
-    # add the DocType mappings
-    index_template.doc_type(doctype)
+    index_template = doctype._index.as_template(alias, pattern)
     # upload the template into elasticsearch
     # potentially overriding the one already there
     index_template.save()

ESSArch_Core/search/documents.py

@@ -108,7 +108,7 @@ def remove_stale(cls, queryset, batch_size):
         db_ids = list(queryset.values_list('id', flat=True))
         s = cls.search()
         resp = s.execute()
-        total_index = resp.hits.total
+        total_index = resp.hits.total['value']
         removed = []
         for start in range(0, total_index, batch_size):
             end = start + batch_size

ESSArch_Core/tags/search.py

@@ -424,7 +424,7 @@ def list(self, request):
             raise
 
         if self.paginator is not None:
-            if size > 0 and results.hits.total > 0 and number > math.ceil(results.hits.total / size):
+            if size > 0 and results.hits.total['value'] > 0 and number > math.ceil(results.hits.total['value'] / size):
                 raise exceptions.NotFound('Invalid page.')
 
         results_dict = results.to_dict()
@@ -440,7 +440,7 @@ def list(self, request):
         if export is not None:
             return self.generate_report(results_dict['hits']['hits'], export, request.user)
 
-        return Response(r, headers={'Count': results.hits.total})
+        return Response(r, headers={'Count': results.hits.total['value']})
 
     def generate_report(self, hits, format, user):
         try:

docker/docker-compose.yml

@@ -147,7 +147,7 @@ services:
     build:
       context: elasticsearch
       args:
-        ELK_VERSION: 6.5.4
+        ELK_VERSION: 7.5.2
     volumes:
       - ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
       - essarch_elasticsearch_data:/usr/share/elasticsearch/data

requirements/base.txt

@@ -27,7 +27,7 @@ distro==1.4.0
 drf-dynamic-fields==0.3.1
 drf-extensions==0.6.0
 drf-proxy-pagination==0.2.0
-elasticsearch-dsl==6.3.1
+elasticsearch-dsl==7.1.0
 glob2==0.7
 jsonfield2==3.1.0
 lxml==4.4.2