diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2018-02-21 09:27:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 09:27:36 +0100 |
| commit | 59e254a7d8ea61ddfb2adde30b0aecef70913704 (patch) | |
| tree | 0188b4fe3ebf8cbfdf7c1b326539e16f90eeb89e | |
| parent | aa24c6e774376d20a12c066fd70624e62e459840 (diff) | |
| parent | cd0a24434a902dffc0a28c9bcfd8dfda799c01c5 (diff) | |
Merge pull request #5088 from vespa-engine/freva/reorder-acl-and-container-start
Start container before running ACL maintainer
2 files changed, 2 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index 05977b9ebce..7b0ba1cae58 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java @@ -254,9 +254,9 @@ public class NodeAgentImpl implements NodeAgent { } private void startContainer(ContainerNodeSpec nodeSpec) { - aclMaintainer.run(); dockerOperations.createContainer(containerName, nodeSpec); dockerOperations.startContainer(containerName, nodeSpec); + aclMaintainer.run(); lastCpuMetric = new CpuUsageReporter(); currentFilebeatRestarter = filebeatRestarter.scheduleWithFixedDelay(() -> serviceRestarter.accept("filebeat"), 1, 1, TimeUnit.DAYS); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java index aa69d68a812..45375586a57 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java @@ -186,9 +186,9 @@ public class NodeAgentImplTest { final InOrder inOrder = inOrder(dockerOperations, orchestrator, nodeRepository, aclMaintainer); inOrder.verify(dockerOperations, times(1)).pullImageAsyncIfNeeded(eq(dockerImage)); - inOrder.verify(aclMaintainer, times(1)).run(); inOrder.verify(dockerOperations, times(1)).createContainer(eq(containerName), eq(nodeSpec)); inOrder.verify(dockerOperations, times(1)).startContainer(eq(containerName), eq(nodeSpec)); + inOrder.verify(aclMaintainer, times(1)).run(); inOrder.verify(dockerOperations, times(1)).resumeNode(eq(containerName)); inOrder.verify(nodeRepository).updateNodeAttributes( hostName, new NodeAttributes() |