Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ldclient/impl/datasystem/async_fdv2.py
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,8 @@ async def _run_initializers(self, set_on_ready: AsyncEvent) -> bool:
return False
except Exception as e:
log.error("Initializer failed with exception: %s", e)
if self._store.is_memory_initialized():
set_on_ready.set()
return False

async def _run_synchronizers(self, set_on_ready: AsyncEvent):
Expand Down
2 changes: 2 additions & 0 deletions ldclient/impl/datasystem/fdv2.py
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,8 @@ def _run_initializers(self, set_on_ready: Event) -> bool:
return False
except Exception as e:
log.error("Initializer failed with exception: %s", e)
if self._store.is_memory_initialized():
set_on_ready.set()
return False

def _run_synchronizers(self, set_on_ready: Event):
Expand Down
4 changes: 4 additions & 0 deletions ldclient/impl/datasystem/store.py
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,10 @@ def is_initialized(self) -> bool:
"""Check if the active store is initialized."""
return self.get_active_store().initialized

def is_memory_initialized(self) -> bool:
"""Check if data has been applied to the in-memory store."""
return self._memory_store.initialized


class Store(_StoreBase):
"""
Expand Down
55 changes: 54 additions & 1 deletion ldclient/testing/impl/datasystem/test_async_fdv2.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

import pytest

from ldclient.async_config import AsyncConfig
from ldclient.async_config import AsyncConfig, AsyncDataSystemConfig
from ldclient.async_feature_store import AsyncInMemoryFeatureStore
from ldclient.config import (
DataSourceBuilder,
DataSourceBuilderConfig,
Expand Down Expand Up @@ -97,6 +98,58 @@ def build(self, config: DataSourceBuilderConfig):
return self._init


@pytest.mark.asyncio
@pytest.mark.parametrize("with_flag", [False, True])
async def test_selectorless_initializer_signals_ready_after_exhaustion(with_flag):
ready = asyncio.Event()
failed_poll_called = asyncio.Event()
builder = ChangeSetBuilder()
builder.start(IntentCode.TRANSFER_FULL)
if with_flag:
builder.add_put(ObjectKind.FLAG, "flag", 1, {"key": "flag", "version": 1})
basis = Basis(builder.finish(Selector.no_selector()), False, None)
poll = MockAsyncInitializer(_Success(value=basis))

class FailingPoll(MockAsyncInitializer):
async def fetch(self, ss):
assert not ready.is_set()
failed_poll_called.set()
return await super().fetch(ss)

failed_poll = FailingPoll(_Fail(error="poll failed", exception=None))
synchronizer = MockAsyncSynchronizer()
data_system = AsyncFDv2(AsyncConfig(sdk_key="dummy"), DataSystemConfig(
initializers=[MockAsyncInitializerBuilder(poll), MockAsyncInitializerBuilder(failed_poll)],
synchronizers=[MockAsyncSynchronizerBuilder(synchronizer)],
))
data_system.start(ready)
try:
await asyncio.wait_for(ready.wait(), timeout=1)
assert failed_poll_called.is_set()
assert await data_system._store.is_ready()
finally:
await data_system.stop()


@pytest.mark.asyncio
async def test_initializer_exhaustion_does_not_signal_ready_from_persistent_data():
persistent_store = AsyncInMemoryFeatureStore()
await persistent_store.init({FEATURES: {}})
failed_poll = MockAsyncInitializer(_Fail(error="poll failed", exception=None))
data_system = AsyncFDv2(AsyncConfig(sdk_key="dummy"), AsyncDataSystemConfig(
initializers=[MockAsyncInitializerBuilder(failed_poll)],
data_store=persistent_store,
))
ready = asyncio.Event()
try:
await data_system._run_initializers(ready)
assert await data_system._store.is_ready()
assert not data_system._store.is_memory_initialized()
assert not ready.is_set()
finally:
await data_system.stop()


def _make_valid_basis() -> Basis:
builder = ChangeSetBuilder()
builder.start(IntentCode.TRANSFER_FULL)
Expand Down
62 changes: 62 additions & 0 deletions ldclient/testing/impl/datasystem/test_fdv2_datasystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from threading import Event
from typing import List

import pytest
from mock import Mock

from ldclient.config import (
Expand All @@ -15,6 +16,7 @@
DataSystemConfig
)
from ldclient.datasystem import file_ds_builder
from ldclient.feature_store import InMemoryFeatureStore
from ldclient.impl.datasystem import DataAvailability
from ldclient.impl.datasystem.fdv2 import FDv2
from ldclient.impl.util import (
Expand Down Expand Up @@ -77,6 +79,66 @@ def build(self, config: DataSourceBuilderConfig) -> Initializer: # pylint: disa
return self._initializer


@pytest.mark.parametrize("with_flag", [False, True])
def test_selectorless_initializer_signals_ready_after_exhaustion(with_flag):
ready = Event()
failed_poll_called = Event()
stopped = Event()
builder = ChangeSetBuilder()
builder.start(IntentCode.TRANSFER_FULL)
if with_flag:
builder.add_put(ObjectKind.FLAG, "flag", 1, {"key": "flag", "version": 1})
basis = Basis(builder.finish(Selector.no_selector()), False, None)
poll = _StaticInitializer("selectorless-poll", _Success(value=basis))

class FailingPoll(_StaticInitializer):
def fetch(self, ss):
assert not ready.is_set()
failed_poll_called.set()
return super().fetch(ss)

failed_poll = FailingPoll("failing-poll", _Fail(error="poll failed", exception=None))

def never_responds(ss):
stopped.wait()
yield from ()

synchronizer = Mock(spec=Synchronizer)
synchronizer.name = "pending-synchronizer"
synchronizer.sync.side_effect = never_responds
synchronizer.stop.side_effect = stopped.set
data_system = FDv2(Config(sdk_key="dummy"), DataSystemConfig(
initializers=[_InitializerBuilder(poll), _InitializerBuilder(failed_poll)],
synchronizers=[MockDataSourceBuilder(synchronizer)],
))
data_system.start(ready)
try:
assert ready.wait(1), "Selectorless initializer data did not signal readiness at exhaustion"
assert failed_poll_called.is_set()
assert data_system._store.is_initialized()
finally:
data_system.stop()


def test_initializer_exhaustion_does_not_signal_ready_from_persistent_data():
persistent_store = InMemoryFeatureStore()
persistent_store.init({FEATURES: {}})
failed_poll = _StaticInitializer("failing-poll", _Fail(error="poll failed", exception=None))
data_system = FDv2(Config(sdk_key="dummy"), DataSystemConfig(
initializers=[_InitializerBuilder(failed_poll)],
synchronizers=[],
data_store=persistent_store,
))
ready = Event()
try:
data_system._run_initializers(ready)
assert data_system._store.is_initialized()
assert not data_system._store.is_memory_initialized()
assert not ready.is_set()
finally:
data_system.stop()


def test_two_phase_init():
td_initializer = TestDataV2.data_source()
td_initializer.update(td_initializer.flag("feature-flag").on(True))
Expand Down
Loading