Skip to content

test(fdv2): stop the recovery test spinning into an OutOfMemoryError #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abelonogov-ld merged 3 commits into from
Sep 25, 2026
Merged

test(fdv2): stop the recovery test spinning into an OutOfMemoryError #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cbbb7d
test(fdv2): build a new synchronizer per factory call in the recovery…
abelonogov-ld Sep 23, 2026
e3f1ef9
test: use valueOf instead of the deprecated boxing constructors in Fl…
abelonogov-ld Sep 23, 2026
486b53a
Merge branch 'main' into andrey/fix-fdv2-datasource-test-oom
abelonogov-ld Sep 24, 2026
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
38 changes: 22 additions & 16 deletions ...kly-android-client-sdk/src/test/java/com/launchdarkly/sdk/android/FDv2DataSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,22 +517,28 @@ public void emptyInitializerListSkipsToSynchronizers() throws Exception {

@Test
public void fallbackAndRecoveryTasksWellBehaved() throws Exception {
// First sync: changeset then INTERRUPTED; second sync: changeset; recovery brings back first
MockQueuedSynchronizer firstSync = new MockQueuedSynchronizer(
FDv2SourceResult.changeSet(makeChangeSet(false), false),
interrupted());
MockQueuedSynchronizer secondSync = new MockQueuedSynchronizer(
FDv2SourceResult.changeSet(makeChangeSet(false), false));

// First sync: changeset then INTERRUPTED; second sync: changeset; recovery brings back first.
// Each factory call builds a new synchronizer, as a real factory does. Recovery closes the
// active one and builds the primary again, and a closed mock answers SHUTDOWN at once, so
// handing the same instance back would spin the orchestrator between two closed mocks.
AtomicInteger firstCallCount = new AtomicInteger(0);
AtomicInteger secondCallCount = new AtomicInteger(0);
MockComponents.MockDataSourceUpdateSink sink = new MockComponents.MockDataSourceUpdateSink();

FDv2DataSource dataSource = buildDataSource(sink,
Collections.emptyList(),
Arrays.asList(
() -> { firstCallCount.incrementAndGet(); return firstSync; },
() -> { secondCallCount.incrementAndGet(); return secondSync; }),
() -> {
firstCallCount.incrementAndGet();
return new MockQueuedSynchronizer(
FDv2SourceResult.changeSet(makeChangeSet(false), false),
interrupted());
},
() -> {
secondCallCount.incrementAndGet();
return new MockQueuedSynchronizer(
FDv2SourceResult.changeSet(makeChangeSet(false), false));
}),
1, 2);

AwaitableCallback<Boolean> startCallback = startDataSource(dataSource);
Expand All @@ -541,6 +547,7 @@ public void fallbackAndRecoveryTasksWellBehaved() throws Exception {
// Wait for fallback + recovery: ~1s fallback + ~2s recovery.
// Use generous timeouts for Android where thread scheduling can delay timer delivery.
sink.awaitApplyCount(3, AWAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
assertTrue(sink.getApplyCount() >= 3);

List<DataSourceState> statuses = sink.awaitStatuses(3, AWAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
assertTrue(statuses.size() >= 3);
Expand Down Expand Up @@ -2030,16 +2037,15 @@ public void orchestrationLogging_fallback_logsInfo() throws Exception {
@Test
public void orchestrationLogging_recovery_logsInfo() throws Exception {
MockComponents.MockDataSourceUpdateSink sink = new MockComponents.MockDataSourceUpdateSink();
MockQueuedSynchronizer firstSync = new MockQueuedSynchronizer(
FDv2SourceResult.changeSet(makeChangeSet(false), false),
interrupted());
MockQueuedSynchronizer secondSync = new MockQueuedSynchronizer(
FDv2SourceResult.changeSet(makeChangeSet(false), false));
// A new synchronizer per build, for the reason fallbackAndRecoveryTasksWellBehaved gives.
FDv2DataSource dataSource = buildDataSource(sink,
Collections.emptyList(),
Arrays.asList(
() -> firstSync,
() -> secondSync),
() -> new MockQueuedSynchronizer(
FDv2SourceResult.changeSet(makeChangeSet(false), false),
interrupted()),
() -> new MockQueuedSynchronizer(
FDv2SourceResult.changeSet(makeChangeSet(false), false))),
1, 2);
AwaitableCallback<Boolean> startCallback = startDataSource(dataSource);
try {
Expand Down
6 changes: 3 additions & 3 deletions launchdarkly-android-client-sdk/src/test/java/com/launchdarkly/sdk/android/FlagTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public void variationIsSerialized() {
public void variationIsDeserialized() {
final String jsonStr = "{\"version\": 99, \"variation\": 2}";
final Flag r = gson.fromJson(jsonStr, Flag.class);
assertEquals(new Integer(2), r.getVariation());
assertEquals(Integer.valueOf(2), r.getVariation());
}

@Test
Expand Down Expand Up @@ -243,12 +243,12 @@ public void debugEventsUntilDateIsSerialized() {
public void debugEventsUntilDateIsDeserialized() {
final String jsonStr = "{\"version\": 99, \"debugEventsUntilDate\": 12345}";
final Flag r = gson.fromJson(jsonStr, Flag.class);
assertEquals(new Long(12345L), r.getDebugEventsUntilDate());
assertEquals(Long.valueOf(12345L), r.getDebugEventsUntilDate());

// Test long sized number
final String jsonStrl = "{\"version\": 99, \"debugEventsUntilDate\": 2500000000}";
final Flag rl = gson.fromJson(jsonStrl, Flag.class);
assertEquals(new Long(2500000000L), rl.getDebugEventsUntilDate());
assertEquals(Long.valueOf(2500000000L), rl.getDebugEventsUntilDate());
}

@Test
Expand Down
Loading