diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2022-02-07 11:56:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-07 11:56:37 +0100 |
commit | 395d83f29a1d270c2d29a5226429d21c34465327 (patch) | |
tree | d6556906d4c61e6b25572c5978e328be72997292 /container-core | |
parent | ce128399b3c29f0b9178f45fb522efb5ff631fe3 (diff) |
Revert "Shutdown reconfiguration thread in a more controlled way [run-systemtest]"
Diffstat (limited to 'container-core')
3 files changed, 5 insertions, 7 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index decb0513e26..bcd3665a3d6 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -145,8 +145,6 @@ public class HandlersConfigurerDi { public void shutdown() { container.shutdown(currentGraph); } - public void shutdownConfigRetriever() { container.shutdownConfigRetriever(); } - /** Returns the currently active application configuration generation */ public long generation() { return currentGraph.generation(); } diff --git a/container-core/src/main/java/com/yahoo/container/di/Container.java b/container-core/src/main/java/com/yahoo/container/di/Container.java index d800851c728..2ef520ea4e9 100644 --- a/container-core/src/main/java/com/yahoo/container/di/Container.java +++ b/container-core/src/main/java/com/yahoo/container/di/Container.java @@ -266,14 +266,14 @@ public class Container { } public void shutdown(ComponentGraph graph) { - shutdownConfigRetriever(); + shutdownConfigurer(); if (graph != null) { scheduleGraphForDeconstruction(graph); destructor.shutdown(); } } - public void shutdownConfigRetriever() { + void shutdownConfigurer() { retriever.shutdown(); } diff --git a/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java b/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java index 74c08b1044b..1570c529cdf 100644 --- a/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java +++ b/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java @@ -44,7 +44,7 @@ public class ContainerTest extends ContainerTestBase { ComponentTakingConfig component = createComponentTakingConfig(getNewComponentGraph(container)); assertEquals("myString", component.config.stringVal()); - container.shutdownConfigRetriever(); + container.shutdownConfigurer(); } @Test @@ -66,7 +66,7 @@ public class ContainerTest extends ContainerTestBase { ComponentTakingConfig component2 = createComponentTakingConfig(newComponentGraph); assertEquals("reconfigured", component2.config.stringVal()); - container.shutdownConfigRetriever(); + container.shutdownConfigurer(); } @Test @@ -90,7 +90,7 @@ public class ContainerTest extends ContainerTestBase { assertNotNull(ComponentGraph.getNode(newGraph, "id1")); assertNotNull(ComponentGraph.getNode(newGraph, "id2")); - container.shutdownConfigRetriever(); + container.shutdownConfigurer(); } //@Test TODO |