Merge pull request #312 from splitio/remove-legacy-bur

Remove legacy bur

Author: chillaq

splitio/client/factory.py

@@ -553,10 +553,15 @@ def _build_localhost_factory(cfg):
 
     sdk_metadata = util.get_metadata(cfg)
     ready_event = threading.Event()
-    synchronizer = LocalhostSynchronizer(synchronizers, tasks)
+    synchronizer = LocalhostSynchronizer(synchronizers, tasks, localhost_mode)
     manager = Manager(ready_event, synchronizer, None, False, sdk_metadata, telemetry_runtime_producer)
-    initialization_thread = threading.Thread(target=manager.start, name="SDKInitializer", daemon=True)
-    initialization_thread.start()
+
+# TODO: BUR is only applied for Localhost JSON mode, in future legacy and yaml will also use BUR
+    if localhost_mode == LocalhostMode.JSON:
+        initialization_thread = threading.Thread(target=manager.start, name="SDKInitializer", daemon=True)
+        initialization_thread.start()
+    else:
+        manager.start()
 
     recorder = StandardRecorder(
         ImpressionsManager(StrategyDebugMode(), telemetry_runtime_producer),

splitio/sync/synchronizer.py

@@ -7,8 +7,7 @@
 
 from splitio.api import APIException
 from splitio.util.backoff import Backoff
-from splitio.sync.split import _ON_DEMAND_FETCH_BACKOFF_BASE, _ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES, _ON_DEMAND_FETCH_BACKOFF_MAX_WAIT
-
+from splitio.sync.split import _ON_DEMAND_FETCH_BACKOFF_BASE, _ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES, _ON_DEMAND_FETCH_BACKOFF_MAX_WAIT, LocalhostMode
 
 _LOGGER = logging.getLogger(__name__)
 _SYNC_ALL_NO_RETRIES = -1
@@ -492,7 +491,7 @@ def stop_periodic_fetching(self):
 class LocalhostSynchronizer(BaseSynchronizer):
     """LocalhostSynchronizer."""
 
-    def __init__(self, split_synchronizers, split_tasks):
+    def __init__(self, split_synchronizers, split_tasks, localhost_mode):
         """
         Class constructor.
 
@@ -503,6 +502,7 @@ def __init__(self, split_synchronizers, split_tasks):
         """
         self._split_synchronizers = split_synchronizers
         self._split_tasks = split_tasks
+        self._localhost_mode = localhost_mode
         self._backoff = Backoff(
                                 _ON_DEMAND_FETCH_BACKOFF_BASE,
                                 _ON_DEMAND_FETCH_BACKOFF_MAX_WAIT)
@@ -511,6 +511,10 @@ def sync_all(self, till=None):
         """
         Synchronize all splits.
         """
+        # TODO: to be removed when legacy and yaml use BUR
+        if self._localhost_mode != LocalhostMode.JSON:
+            return self.synchronize_splits()
+
         self._backoff.reset()
         remaining_attempts = _ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES
         while remaining_attempts > 0:

splitio/version.py

@@ -1 +1 @@
-__version__ = '9.4.0'
+__version__ = '9.4.0-rc2'

tests/integration/test_client_e2e.py

@@ -1069,11 +1069,24 @@ def _synchronize_now(self):
         self.factory._sync_manager._synchronizer._split_synchronizers._split_sync.synchronize_splits()
 
     def test_incorrect_file_e2e(self):
-        factory = get_factory('localhost', config={'splitFile': 'filename'})
+        """Test initialize factory with a incorrect file name."""
+        # TODO: secontion below is removed when legacu use BUR
+        # legacy and yaml
+        exception_raised = False
+        factory = None
+        try:
+            factory = get_factory('localhost', config={'splitFile': 'filename'})
+        except Exception as e:
+            exception_raised = True
+
+        assert(exception_raised)
+
+        # json using BUR
+        factory = get_factory('localhost', config={'splitFile': 'filename.json'})
         exception_raised = False
         try:
             factory.block_until_ready(1)
-        except TimeoutException as e:
+        except Exception as e:
             exception_raised = True
 
         assert(exception_raised)
@@ -1082,6 +1095,7 @@ def test_incorrect_file_e2e(self):
         factory.destroy(event)
         event.wait()
 
+
     def test_localhost_e2e(self):
         """Instantiate a client with a YAML file and issue get_treatment() calls."""
         filename = os.path.join(os.path.dirname(__file__), 'files', 'file2.yaml')

tests/sync/test_synchronizer.py

@@ -9,7 +9,7 @@
 from splitio.tasks.segment_sync import SegmentSynchronizationTask
 from splitio.tasks.impressions_sync import ImpressionsSyncTask, ImpressionsCountSyncTask
 from splitio.tasks.events_sync import EventsSyncTask
-from splitio.sync.split import SplitSynchronizer, LocalSplitSynchronizer
+from splitio.sync.split import SplitSynchronizer, LocalSplitSynchronizer, LocalhostMode
 from splitio.sync.segment import SegmentSynchronizer, LocalSegmentSynchronizer
 from splitio.sync.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer
 from splitio.sync.event import EventSynchronizer
@@ -349,7 +349,7 @@ def test_synchronize_splits(self, mocker):
         split_sync = LocalSplitSynchronizer(mocker.Mock(), mocker.Mock(), mocker.Mock())
         segment_sync = LocalSegmentSynchronizer(mocker.Mock(), mocker.Mock(), mocker.Mock())
         synchronizers = SplitSynchronizers(split_sync, segment_sync, None, None, None)
-        local_synchronizer = LocalhostSynchronizer(synchronizers, mocker.Mock())
+        local_synchronizer = LocalhostSynchronizer(synchronizers, mocker.Mock(), mocker.Mock())
 
         def synchronize_splits(*args, **kwargs):
             return ["segmentA", "segmentB"]
@@ -390,7 +390,7 @@ def segment_task_stop(*args, **kwargs):
             self.segment_task_stop_called = True
         segment_task.stop = segment_task_stop
 
-        local_synchronizer = LocalhostSynchronizer(synchronizers, tasks)
+        local_synchronizer = LocalhostSynchronizer(synchronizers, tasks, LocalhostMode.JSON)
         local_synchronizer.start_periodic_fetching()
         assert(self.split_task_start_called)
         assert(self.segment_task_start_called)