Skip to content

Fix blocking behavior when sending update notification. #313

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
merged 5 commits into from
Jun 26, 2019
Merged

Fix blocking behavior when sending update notification. #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2bf8645
Fix blocking behavior when sending update notification.
Jun 21, 2019
6fbbc61
Retrigger build.
Jun 25, 2019
eb9e8d9
Retrigger build.
Jun 25, 2019
e42dfb9
Retrigger build.
Jun 25, 2019
a1243b6
Retrigger build.
Jun 26, 2019
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: 1 addition & 1 deletion core-api/src/main/java/com/optimizely/ab/config/PollingProjectConfigManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ void setConfig(ProjectConfig projectConfig) {
logger.info("New datafile set with revision: {}. Old revision: {}", projectConfig.getRevision(), previousRevision);

currentProjectConfig.set(projectConfig);
notificationCenter.send(SIGNAL);
countDownLatch.countDown();
notificationCenter.send(SIGNAL);
}

public NotificationCenter getNotificationCenter() {
Expand Down
21 changes: 20 additions & 1 deletion core-api/src/test/java/com/optimizely/ab/config/PollingProjectConfigManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.junit.Ignore;
import org.junit.Test;

import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
Expand Down Expand Up @@ -195,6 +196,20 @@ public void testUpdateConfigNotificationGetsTriggered() throws InterruptedExcept
assertTrue(countDownLatch.await(500, TimeUnit.MILLISECONDS));
}

@Test
public void testUpdateConfigNotificationDoesNotResultInDeadlock() throws Exception {
NotificationCenter notificationCenter = new NotificationCenter();

TestProjectConfigManager testProjectConfigManager = new TestProjectConfigManager(projectConfig, TimeUnit.SECONDS.toMillis(10), notificationCenter);
notificationCenter.getNotificationManager(UpdateConfigNotification.class)
.addHandler(message -> {
assertNotNull(testProjectConfigManager.getConfig());
});

testProjectConfigManager.start();
CompletableFuture.runAsync(testProjectConfigManager::getConfig).get(5, TimeUnit.SECONDS);
}

private static class TestProjectConfigManager extends PollingProjectConfigManager {
private final AtomicInteger counter = new AtomicInteger();

Expand All @@ -206,7 +221,11 @@ private TestProjectConfigManager() {
}

private TestProjectConfigManager(ProjectConfig projectConfig) {
super(POLLING_PERIOD, POLLING_UNIT, POLLING_PERIOD / 2, POLLING_UNIT, new NotificationCenter());
this(projectConfig, POLLING_PERIOD / 2, new NotificationCenter());
}

private TestProjectConfigManager(ProjectConfig projectConfig, long blockPeriod, NotificationCenter notificationCenter) {
super(POLLING_PERIOD, POLLING_UNIT, blockPeriod, POLLING_UNIT, notificationCenter);
this.projectConfig = projectConfig;
}

Expand Down