Added final_segment_list in split sync iteration

Author: chillaq

splitio/sync/split.py

@@ -96,14 +96,16 @@ def _attempt_split_sync(self, fetch_options, till=None):
         :rtype: bool, int, int
         """
         self._backoff.reset()
+        final_segment_list = set()
         remaining_attempts = _ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES
         while True:
             remaining_attempts -= 1
             change_number, segment_list = self._fetch_until(fetch_options, till)
+            final_segment_list.update(segment_list)
             if till is None or till <= change_number:
-                return True, remaining_attempts, change_number, segment_list
+                return True, remaining_attempts, change_number, final_segment_list
             elif remaining_attempts <= 0:
-                return False, remaining_attempts, change_number, segment_list
+                return False, remaining_attempts, change_number, final_segment_list
             how_long = self._backoff.get()
             time.sleep(how_long)
 
@@ -114,20 +116,23 @@ def synchronize_splits(self, till=None):
         :param till: Passed till from Streaming.
         :type till: int
         """
+        final_segment_list = set()
         fetch_options = FetchOptions(True)  # Set Cache-Control to no-cache
         successful_sync, remaining_attempts, change_number, segment_list = self._attempt_split_sync(fetch_options,
                                                                                       till)
+        final_segment_list.update(segment_list)
         attempts = _ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES - remaining_attempts
         if successful_sync:  # succedeed sync
             _LOGGER.debug('Refresh completed in %d attempts.', attempts)
-            return segment_list
+            return final_segment_list
         with_cdn_bypass = FetchOptions(True, change_number)  # Set flag for bypassing CDN
         without_cdn_successful_sync, remaining_attempts, change_number, segment_list = self._attempt_split_sync(with_cdn_bypass, till)
+        final_segment_list.update(segment_list)
         without_cdn_attempts = _ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES - remaining_attempts
         if without_cdn_successful_sync:
             _LOGGER.debug('Refresh completed bypassing the CDN in %d attempts.',
                           without_cdn_attempts)
-            return segment_list
+            return final_segment_list
         else:
             _LOGGER.debug('No changes fetched after %d attempts with CDN bypassed.',
                           without_cdn_attempts)