MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve some test flakiness by adding a deterministic "wait" mechanism. (SERVER-86)

This commit is contained in:
Jon Chambers 2020-06-26 16:27:24 -04:00 committed by Jon Chambers
parent e48afc9fdf
commit a68d91b54c
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
service/src/main/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsManager.java
View File

@ -32,12 +32,12 @@ public class RemoteConfigsManager implements Managed {
@Override @Override
public void start() { public void start() {
this.cachedConfigs.set(remoteConfigs.getAll()); refreshCache();
new Thread(() -> { new Thread(() -> {
while (true) { while (true) {
try { try {
this.cachedConfigs.set(remoteConfigs.getAll()); refreshCache();
} catch (Throwable t) { } catch (Throwable t) {
logger.warn("Error updating remote configs cache", t); logger.warn("Error updating remote configs cache", t);
} }
@ -47,6 +47,21 @@ public class RemoteConfigsManager implements Managed {
}).start(); }).start();
} }
private void refreshCache() {
this.cachedConfigs.set(remoteConfigs.getAll());
synchronized (this.cachedConfigs) {
this.cachedConfigs.notifyAll();
}
}
@VisibleForTesting
void waitForCacheRefresh() throws InterruptedException {
synchronized (this.cachedConfigs) {
this.cachedConfigs.wait();
}
}
public List<RemoteConfig> getAll() { public List<RemoteConfig> getAll() {
return cachedConfigs.get(); return cachedConfigs.get();
} }

8
service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/RemoteConfigsManagerTest.java → service/src/test/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsManagerTest.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecuregcm.tests.storage; package org.whispersystems.textsecuregcm.storage;
import com.opentable.db.postgres.embedded.LiquibasePreparer; import com.opentable.db.postgres.embedded.LiquibasePreparer;
import com.opentable.db.postgres.junit.EmbeddedPostgresRules; import com.opentable.db.postgres.junit.EmbeddedPostgresRules;
@ -8,10 +8,6 @@ import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration; import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration;
import org.whispersystems.textsecuregcm.storage.FaultTolerantDatabase;
import org.whispersystems.textsecuregcm.storage.RemoteConfig;
import org.whispersystems.textsecuregcm.storage.RemoteConfigs;
import org.whispersystems.textsecuregcm.storage.RemoteConfigsManager;
import org.whispersystems.textsecuregcm.tests.util.AuthHelper; import org.whispersystems.textsecuregcm.tests.util.AuthHelper;
import java.util.List; import java.util.List;
@ -41,7 +37,7 @@ public class RemoteConfigsManagerTest {
remoteConfigs.set(new RemoteConfig("ios.stickers", 75, Set.of(), "FALSE", "TRUE", null)); remoteConfigs.set(new RemoteConfig("ios.stickers", 75, Set.of(), "FALSE", "TRUE", null));
remoteConfigs.set(new RemoteConfig("value.sometimes", 25, Set.of(AuthHelper.VALID_UUID), "abc", "def", null)); remoteConfigs.set(new RemoteConfig("value.sometimes", 25, Set.of(AuthHelper.VALID_UUID), "abc", "def", null));
Thread.sleep(501); remoteConfigs.waitForCacheRefresh();
List<RemoteConfig> results = remoteConfigs.getAll(); List<RemoteConfig> results = remoteConfigs.getAll();