diff options
| author | Haakon Dybdahl <dybis@users.noreply.github.com> | 2016-09-07 13:29:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-07 13:29:23 +0200 |
| commit | 3226bc6eb1b4652a1d8987e27e98bcf028af4c45 (patch) | |
| tree | 0270639fa754af2ee944828b28b8aee53e72ea75 /node-admin | |
| parent | 9d287c7d1e74ea3788d5e9bc1fcdd32e365d3e1c (diff) | |
| parent | 5d8cad78e02f9a9e3732e69f2079e73bc87142df (diff) | |
Merge pull request #578 from yahoo/hmusum/do-not-patch-node-repo-before-mark-as-ready
Temporarily skip updating node repo with current attributes
Diffstat (limited to 'node-admin')
2 files changed, 6 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 df859cb62cf..6441695340f 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 @@ -171,6 +171,7 @@ public class NodeAgentImpl implements NodeAgent { } private void updateNodeRepoAndMarkNodeAsReady(ContainerNodeSpec nodeSpec) throws IOException { + /* publishStateToNodeRepoIfChanged( nodeSpec.hostname, // Clear current Docker image and vespa version, as nothing is running on this node @@ -178,6 +179,7 @@ public class NodeAgentImpl implements NodeAgent { nodeSpec.wantedRestartGeneration.orElse(0L), new DockerImage(""), "")); + */ nodeRepository.markAsReady(nodeSpec.hostname); } 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 17f9cda1f19..aa1a93e4410 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 @@ -274,8 +274,10 @@ public class NodeAgentImplTest { verify(dockerOperations, never()).startContainerIfNeeded(any()); verify(orchestrator, never()).resume(any(HostName.class)); // current Docker image and vespa version should be cleared - verify(nodeRepository, times(1)).updateNodeAttributes( - any(HostName.class), anyLong(), eq(new DockerImage("")), eq("")); + //verify(nodeRepository, times(1)).updateNodeAttributes( + // any(HostName.class), anyLong(), eq(new DockerImage("")), eq("")); + verify(nodeRepository, never()).updateNodeAttributes( + any(HostName.class), anyLong(), any(DockerImage.class), any(String.class)); } @Test |