Better handling of invalid iterations on add_batch

apiserver/bll/event/event_bll.py

@@ -10,6 +10,7 @@ from typing import Sequence, Set, Tuple, Optional, Dict
 
 import six
 from elasticsearch import helpers
+from elasticsearch.helpers import BulkIndexError
 from mongoengine import Q
 from nested_dict import nested_dict
 
@@ -42,6 +43,8 @@ from apiserver.utilities.json import loads
 # noinspection PyTypeChecker
 EVENT_TYPES: Set[str] = set(map(attrgetter("value"), EventType))
 LOCKED_TASK_STATUSES = (TaskStatus.publishing, TaskStatus.published)
+MAX_LONG = 2**63 - 1
+MIN_LONG = -2**63
 
 
 class PlotFields:
@@ -101,6 +104,7 @@ class EventBLL(object):
             3, dict
         )  # task_id -> metric_hash -> event_type -> MetricEvent
         errors_per_type = defaultdict(int)
+        invalid_iteration_error = f"Iteration number should not exceed {MAX_LONG}"
         valid_tasks = self._get_valid_tasks(
             company_id,
             task_ids={
@@ -150,6 +154,9 @@ class EventBLL(object):
             iter = event.get("iter")
             if iter is not None:
                 iter = int(iter)
+                if iter > MAX_LONG or iter < MIN_LONG:
+                    errors_per_type[invalid_iteration_error] += 1
+                    continue
                 event["iter"] = iter
 
             # used to have "values" to indicate array. no need anymore
@@ -206,9 +213,10 @@ class EventBLL(object):
             )
 
         added = 0
+        with translate_errors_context():
             if actions:
                 chunk_size = 500
-            with translate_errors_context(), TimingContext("es", "events_add_batch"):
+                with TimingContext("es", "events_add_batch"):
                     # TODO: replace it with helpers.parallel_bulk in the future once the parallel pool leak is fixed
                     with closing(
                         helpers.streaming_bulk(
@@ -248,6 +256,13 @@ class EventBLL(object):
                             remaining_tasks, company_id, last_update=now
                         )
 
+            # this is for backwards compatibility with streaming bulk throwing exception on those
+            invalid_iterations_count = errors_per_type.get(invalid_iteration_error)
+            if invalid_iterations_count:
+                raise BulkIndexError(
+                    f"{invalid_iterations_count} document(s) failed to index.", [invalid_iteration_error]
+                )
+
         if not added:
             raise errors.bad_request.EventsNotAdded(**errors_per_type)