Shutdown renderer threads on deconstruct

2 files changed, 24 insertions, 6 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index 733e0aa43d9..09b48242c1e 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -208,8 +208,13 @@ public class SearchHandler extends LoggingRequestHandler {
              executor, accessLog, queryProfileConfig, searchers);
     }
 
-    private void setupSearchChainRegistry(final ComponentRegistry<Searcher> searchers,
-                                          final ChainsConfig chainsConfig) {
+    @Override
+    protected void destroy() {
+        super.destroy();
+        rendererRegistry.deconstruct();
+    }
+
+    private void setupSearchChainRegistry(ComponentRegistry<Searcher> searchers, ChainsConfig chainsConfig) {
         ChainsModel chainsModel = ChainsModelBuilder.buildFromConfig(chainsConfig);
         ChainsConfigurer.prepareChainRegistry(searchChainRegistry, chainsModel, searchers);
         searchChainRegistry.freeze();
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java b/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java
index c1b15ecbbc2..a05661abc2b 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java
@@ -26,6 +26,9 @@ public final class RendererRegistry extends ComponentRegistry<com.yahoo.processi
     public static final ComponentId xmlRendererId = ComponentId.fromString("DefaultRenderer");
     public static final ComponentId jsonRendererId = ComponentId.fromString("JsonRenderer");
     public static final ComponentId defaultRendererId = jsonRendererId;
+    
+    private final ComponentId tiledRendererId;
+    private final ComponentId pageRendererId;
 
     /** Creates a registry containing the built-in renderers only */
     public RendererRegistry() {
@@ -65,19 +68,29 @@ public final class RendererRegistry extends ComponentRegistry<com.yahoo.processi
         for (Renderer renderer : renderers)
             register(renderer.getId(), renderer);
 
-        // add legacy "templates" converted to renderers
-        addTemplateSet(new TiledTemplateSet());
-        addTemplateSet(new PageTemplateSet());
+        // add legacy "templates" converted to renderers // TODO: Remove on Vespa 7
+        tiledRendererId = addTemplateSet(new TiledTemplateSet());
+        pageRendererId = addTemplateSet(new PageTemplateSet());
 
         freeze();
     }
+    
+    /** Must be called when use of this is discontinued to free the resources it has allocated */
+    public void deconstruct() {
+        // deconstruct the renderers which was created by this
+        getRenderer(jsonRendererId.toSpecification()).deconstruct();
+        getRenderer(xmlRendererId.toSpecification()).deconstruct();
+        getRenderer(tiledRendererId.toSpecification()).deconstruct();
+        getRenderer(pageRendererId.toSpecification()).deconstruct();
+    }
 
     @SuppressWarnings({"deprecation", "unchecked"})
-    private void addTemplateSet(UserTemplate<?> templateSet) {
+    private ComponentId addTemplateSet(UserTemplate<?> templateSet) {
         Renderer renderer = new SearchRendererAdaptor(templateSet);
         ComponentId rendererId = new ComponentId(templateSet.getName());
         renderer.initId(rendererId);
         register(rendererId, renderer);
+        return rendererId;
     }
 
     /**