diff options
| author | Harald Musum <musum@yahooinc.com> | 2021-12-10 17:55:28 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2021-12-10 17:55:28 +0100 |
| commit | 5dd80d61e7bee2acb8bc9bba3448f4bb70b43b68 (patch) | |
| tree | e696026dbbf10031b96dec42c5202c7986909e57 /config-proxy | |
| parent | 3fca6584773338c6166c1f3016f384f834e97426 (diff) | |
Make sure to keep memory cache when switching mode
Diffstat (limited to 'config-proxy')
3 files changed, 4 insertions, 4 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java index 7ae8501278d..f1be03f07d4 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java @@ -22,8 +22,8 @@ class MemoryCacheConfigClient implements ConfigSourceClient { private final MemoryCache cache; private final DelayedResponses delayedResponses = new DelayedResponses(); - MemoryCacheConfigClient() { - this.cache = new MemoryCache(); + MemoryCacheConfigClient(MemoryCache cache) { + this.cache = cache; } /** diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java index 8756090e420..0ae02e4c17b 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java @@ -94,7 +94,7 @@ public class ProxyServer implements Runnable { switch (newMode.getMode()) { case MEMORYCACHE: configClient.shutdownSourceConnections(); - configClient = new MemoryCacheConfigClient(); + configClient = new MemoryCacheConfigClient(configClient.memoryCache()); this.mode = new Mode(modeName); break; case DEFAULT: diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java index ae7350b11e0..0b590aea789 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java @@ -16,7 +16,7 @@ public class MemoryCacheConfigClientTest { @Test public void basic() { - MemoryCacheConfigClient client = new MemoryCacheConfigClient(); + MemoryCacheConfigClient client = new MemoryCacheConfigClient(new MemoryCache()); client.memoryCache().update(ConfigTester.fooConfig); assertThat(client.getConfig(ConfigTester.fooConfig, null), is(ConfigTester.fooConfig)); assertNull(client.getConfig(ConfigTester.barConfig, null)); |