diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-11-10 17:10:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-10 17:10:41 +0100 |
commit | 5650013fc4aef300afef53db1b76b264e428e964 (patch) | |
tree | 852133a3478c15293b57fa5af2846f458b8a1be1 | |
parent | d29ea00445b0e98f6e3fa83844e9263a518527d4 (diff) |
Revert "Always update config when generation has changed [run-systemtest]"
-rw-r--r-- | config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java | 16 | ||||
-rw-r--r-- | config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java | 14 |
2 files changed, 2 insertions, 28 deletions
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 a3265671d50..6a81c2279d1 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 @@ -16,9 +16,7 @@ import com.yahoo.vespa.config.TimingValues; import com.yahoo.vespa.config.protocol.DefContent; import java.io.File; -import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; -import java.util.logging.Level; import java.util.logging.Logger; import static com.yahoo.vespa.config.PayloadChecksum.Type.MD5; @@ -205,18 +203,6 @@ public abstract class ConfigSubscription<T extends ConfigInstance> { this.config.set(new ConfigState<>(true, generation, applyOnRestart, true, config, payloadChecksums)); } - void setConfigAndGeneration(Long generation, boolean applyOnRestart, T config, PayloadChecksums payloadChecksums) { - ConfigState<T> prev = this.config.get(); - boolean configChanged = !Objects.equals(prev.getConfig(), config); - String message = "Config has changed unexpectedly for " + key + ", generation " + generation; - if (configChanged) { - if (log.isLoggable(Level.FINE)) - message = message + ", config in state :" + prev.getConfig() + ", new config: " + config; - log.log(Level.WARNING, message); - } - this.config.set(new ConfigState<>(true, generation, applyOnRestart, configChanged, config, payloadChecksums)); - } - /** * Used by {@link FileConfigSubscription} and {@link ConfigSetSubscription} */ @@ -227,7 +213,7 @@ public abstract class ConfigSubscription<T extends ConfigInstance> { protected void setConfigIfChanged(T config) { ConfigState<T> prev = this.config.get(); - this.config.set(new ConfigState<>(true, prev.getGeneration(), prev.applyOnRestart(), !Objects.equals(prev.getConfig(), config), config, prev.payloadChecksums)); + this.config.set(new ConfigState<>(true, prev.getGeneration(), prev.applyOnRestart(), !config.equals(prev.getConfig()), config, prev.payloadChecksums)); } void setGeneration(Long generation) { diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java index c6ea79ddbcd..27099790f5b 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java @@ -73,7 +73,7 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc if (jrtReq.hasUpdatedConfig()) { setNewConfig(jrtReq); } else { - setNewConfigAndGeneration(jrtReq); + setGeneration(jrtReq.getNewGeneration()); } } @@ -110,18 +110,6 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc } } - protected void setNewConfigAndGeneration(JRTClientConfigRequest jrtReq) { - try { - T configInstance = toConfigInstance(jrtReq); - setConfigAndGeneration(jrtReq.getNewGeneration(), - jrtReq.responseIsApplyOnRestart(), - configInstance, - jrtReq.getNewChecksums()); - } catch (IllegalArgumentException e) { - throw new IllegalArgumentException("Bad config in response", e); - } - } - /** * This method should ideally throw new MissingConfig/Configuration exceptions and let the caller * catch them. However, this would make the code in JRT/File/RawSource uglier. |