From c6b0b5646bf4e0c2f4470d6b589cadbbc2a7c5a0 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Sat, 9 Jun 2018 10:53:17 +0200 Subject: Propagate internal redeploy --- .../com/yahoo/config/subscription/impl/ConfigSubscription.java | 4 ++-- .../config/subscription/impl/GenericJRTConfigSubscription.java | 2 +- .../com/yahoo/config/subscription/impl/JRTConfigSubscription.java | 2 +- .../com/yahoo/config/subscription/impl/JarConfigSubscription.java | 2 +- .../com/yahoo/config/subscription/impl/RawConfigSubscription.java | 2 +- .../java/com/yahoo/vespa/config/protocol/JRTConfigRequest.java | 3 +-- .../com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java | 7 +++---- 7 files changed, 10 insertions(+), 12 deletions(-) (limited to 'config') diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java index 2b6f9e24dd3..9f277330401 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java @@ -182,8 +182,8 @@ public abstract class ConfigSubscription { return !prev.getGeneration().equals(requiredGen) || prev.isConfigChanged(); } - void setConfig(Long generation, T config) { - this.config.set(new ConfigState<>(true, generation, false, true, config)); + void setConfig(Long generation, boolean internalRedeploy, T config) { + this.config.set(new ConfigState<>(true, generation, internalRedeploy, true, config)); } // Only used by {@link FileConfigSubscription} diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java index 69c57120577..e8c7edd3943 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java @@ -32,7 +32,7 @@ public class GenericJRTConfigSubscription extends JRTConfigSubscription extends ConfigSubsc } catch (IOException e) { throw new ConfigurationRuntimeException(e); } - setConfig(0L, config); + setConfig(0L, false, config); try { jarFile.close(); } catch (IOException e) { diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/RawConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/RawConfigSubscription.java index 60811dd38d1..bc546cfdd1f 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/RawConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/RawConfigSubscription.java @@ -35,7 +35,7 @@ public class RawConfigSubscription extends ConfigSubsc if (payload==null) { payload = inputPayload; ConfigPayload configPayload = new CfgConfigPayloadBuilder().deserialize(Arrays.asList(payload.split("\n"))); - setConfig(0L, configPayload.toInstance(configClass, key.getConfigId())); + setConfig(0L, false, configPayload.toInstance(configClass, key.getConfigId())); return true; } try { diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTConfigRequest.java b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTConfigRequest.java index a8d8b6d480b..46b3651afd7 100644 --- a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTConfigRequest.java +++ b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTConfigRequest.java @@ -8,8 +8,7 @@ import java.util.Optional; /** * Common interface for jrt config requests available both at server and client. - * @author lulf - * @since 5.3 + * @author Ulf Lilleengen */ public interface JRTConfigRequest { /** diff --git a/config/src/test/java/com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java b/config/src/test/java/com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java index 1ad66cbaf58..757dd99f43b 100644 --- a/config/src/test/java/com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java @@ -22,7 +22,6 @@ import static org.junit.Assert.assertTrue; /** * @author hmusum - * @since 5.1.11 */ public class JRTConfigRequesterTest { @@ -181,7 +180,7 @@ public class JRTConfigRequesterTest { ConfigSubscriber subscriber = new ConfigSubscriber(); final TimingValues timingValues = getTestTimingValues(); JRTConfigSubscription sub = createSubscription(subscriber, timingValues); - sub.setConfig(1L, config()); + sub.setConfig(1L, false, config()); final MockConnection connection = new MockConnection(new ErrorResponseHandler()); JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); @@ -209,7 +208,7 @@ public class JRTConfigRequesterTest { ConfigSubscriber subscriber = new ConfigSubscriber(); final TimingValues timingValues = getTestTimingValues(); JRTConfigSubscription sub = createSubscription(subscriber, timingValues); - sub.setConfig(1L, config()); + sub.setConfig(1L, false, config()); final MockConnection connection = new MockConnection(new ErrorResponseHandler(com.yahoo.jrt.ErrorCode.TIMEOUT)); JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); @@ -224,7 +223,7 @@ public class JRTConfigRequesterTest { ConfigSubscriber subscriber = new ConfigSubscriber(); final TimingValues timingValues = getTestTimingValues(); JRTConfigSubscription sub = createSubscription(subscriber, timingValues); - sub.setConfig(1L, config()); + sub.setConfig(1L, false, config()); final MockConnection connection = new MockConnection(new ErrorResponseHandler(ErrorCode.UNKNOWN_DEFINITION)); JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); -- cgit v1.2.3