diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-12-04 16:33:53 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-12-04 16:33:53 +0100 |
commit | 11a6adc99f91e41a9fc444a5c7e3db506f679cc6 (patch) | |
tree | 8f07e130bb24cea54c3dbc88fa22c160b3bf91f6 /container-di/src/main/java/com/yahoo/container/di/Container.java | |
parent | 8091fb8275d26af887ccc6e20058ab4d16787d05 (diff) |
Keep internal-redeploy serverside. Remove old restartOnDeploy implementation.
Diffstat (limited to 'container-di/src/main/java/com/yahoo/container/di/Container.java')
-rw-r--r-- | container-di/src/main/java/com/yahoo/container/di/Container.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/container-di/src/main/java/com/yahoo/container/di/Container.java b/container-di/src/main/java/com/yahoo/container/di/Container.java index af580767a17..42aa29af95c 100644 --- a/container-di/src/main/java/com/yahoo/container/di/Container.java +++ b/container-di/src/main/java/com/yahoo/container/di/Container.java @@ -71,10 +71,10 @@ public class Container { }); } - public ComponentGraph getNewComponentGraph(ComponentGraph oldGraph, Injector fallbackInjector, boolean restartOnRedeploy) { + public ComponentGraph getNewComponentGraph(ComponentGraph oldGraph, Injector fallbackInjector) { try { Collection<Bundle> obsoleteBundles = new HashSet<>(); - ComponentGraph newGraph = getConfigAndCreateGraph(oldGraph, fallbackInjector, restartOnRedeploy, obsoleteBundles); + ComponentGraph newGraph = getConfigAndCreateGraph(oldGraph, fallbackInjector, obsoleteBundles); newGraph.reuseNodes(oldGraph); constructComponents(newGraph); deconstructObsoleteComponents(oldGraph, newGraph, obsoleteBundles); @@ -87,12 +87,11 @@ public class Container { private ComponentGraph getConfigAndCreateGraph(ComponentGraph graph, Injector fallbackInjector, - boolean restartOnRedeploy, Collection<Bundle> obsoleteBundles) // NOTE: Return value { ConfigSnapshot snapshot; while (true) { - snapshot = configurer.getConfigs(graph.configKeys(), leastGeneration, restartOnRedeploy); + snapshot = configurer.getConfigs(graph.configKeys(), leastGeneration); log.log(FINE, String.format("createNewGraph:\n" + "graph.configKeys = %s\n" + "graph.generation = %s\n" + "snapshot = %s\n", graph.configKeys(), graph.generation(), snapshot)); |