diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-12-16 16:15:45 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2019-12-16 16:15:45 +0100 |
| commit | 69ac206aa9e8d4b321defacc33c57f14065f5163 (patch) | |
| tree | aff2edd00eb103c16b5f582b556d0edd8d7f0d18 /node-admin | |
| parent | 65dd6eb4932a7c29cbad7d717bc34da73d0bb723 (diff) | |
Pass initial node agent context to factory
Diffstat (limited to 'node-admin')
3 files changed, 3 insertions, 3 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java index dddb724e3d6..ca6a56413c3 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java @@ -211,7 +211,7 @@ public class NodeAdminImpl implements NodeAdmin { private static NodeAgentWithScheduler create(Clock clock, NodeAgentFactory nodeAgentFactory, NodeAgentContext context) { NodeAgentContextManager contextManager = new NodeAgentContextManager(clock, context); - NodeAgent nodeAgent = nodeAgentFactory.create(contextManager); + NodeAgent nodeAgent = nodeAgentFactory.create(contextManager, context); return new NodeAgentWithScheduler(nodeAgent, contextManager); } } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentFactory.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentFactory.java index bd13b7eb094..6ad68d9c4e9 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentFactory.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentFactory.java @@ -6,5 +6,5 @@ package com.yahoo.vespa.hosted.node.admin.nodeagent; */ @FunctionalInterface public interface NodeAgentFactory { - NodeAgent create(NodeAgentContextSupplier contextSupplier); + NodeAgent create(NodeAgentContextSupplier contextSupplier, NodeAgentContext nodeAgentContext); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java index 70b406b3056..8101acb4b3e 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java @@ -92,7 +92,7 @@ public class DockerTester implements AutoCloseable { DockerOperations dockerOperations = new DockerOperationsImpl(docker, processExecuter, ipAddresses); Metrics metrics = new Metrics(); - NodeAgentFactory nodeAgentFactory = contextSupplier -> new NodeAgentImpl( + NodeAgentFactory nodeAgentFactory = (contextSupplier, nodeContext) -> new NodeAgentImpl( contextSupplier, nodeRepository, orchestrator, dockerOperations, storageMaintainer, flagSource, Optional.empty(), Optional.empty(), Optional.empty()); nodeAdmin = new NodeAdminImpl(nodeAgentFactory, metrics, Clock.systemUTC(), Duration.ofMillis(10), Duration.ZERO); |