diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-06-20 13:13:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-20 13:13:45 +0200 |
commit | ffd1db0e70e8deeddb884bb1e7a9cfa03da4c244 (patch) | |
tree | ac7af4b3c1758e08c5e464a91ac0a03bed45cd8b | |
parent | f174fb8b0875ac4ad1aaa8d5f09f43c36a702d4c (diff) | |
parent | 93716ec07d5a40ce7f7ef19aa820b1f80e15c2de (diff) |
Merge pull request #6244 from vespa-engine/bratseth/double-account-internal-redeploy-correctly
Propagate internalRedeploy to the RawConfig instance
-rw-r--r-- | config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java | 11 | ||||
-rwxr-xr-x | config/src/main/java/com/yahoo/vespa/config/RawConfig.java | 2 |
2 files changed, 13 insertions, 0 deletions
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 e8c7edd3943..c1f9ce02650 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 @@ -50,6 +50,17 @@ public class GenericJRTConfigSubscription extends JRTConfigSubscription<RawConfi } } + // Override to propagate internal redeploy into the config value in addition to the config state + @Override + void setInternalRedeploy(boolean internalRedeploy) { + super.setInternalRedeploy(internalRedeploy); + ConfigState<RawConfig> configState = getConfigState(); + + if (configState.getConfig() != null) { + configState.getConfig().setInternalRedeploy(internalRedeploy); + } + } + public RawConfig getRawConfig() { return getConfigState().getConfig(); } diff --git a/config/src/main/java/com/yahoo/vespa/config/RawConfig.java b/config/src/main/java/com/yahoo/vespa/config/RawConfig.java index ae4431e5195..8ff69b56ffe 100755 --- a/config/src/main/java/com/yahoo/vespa/config/RawConfig.java +++ b/config/src/main/java/com/yahoo/vespa/config/RawConfig.java @@ -116,6 +116,8 @@ public class RawConfig extends ConfigInstance { public void setGeneration(long generation) { this.generation = generation; } + public void setInternalRedeploy(boolean internalRedeploy) { this.internalRedeploy = internalRedeploy; } + /** * Returns whether this config generation was created by a system internal redeploy, not an * application package change. |