diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-05-22 11:01:43 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-05-22 11:01:43 +0200 |
| commit | 1f9d416afb756f97647c73f9df002a2ef2c42928 (patch) | |
| tree | 11b1cb482a163ca7c1c6ec0f48cfb0ad7fc19716 /node-admin | |
| parent | d20d56d510c4ec286870c1a0b4ef1b333f896f7c (diff) | |
Update new metrics rpc port after adding admin rpc.
Diffstat (limited to 'node-admin')
2 files changed, 3 insertions, 3 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 50bf57c78ff..80d924153c8 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 @@ -608,7 +608,7 @@ public class NodeAgentImpl implements NodeAgent { // TODO: Clean up and inline method when old metrics proxy has been discontinued. private void runPushMetricsCommand(NodeAgentContext context, String wrappedMetrics, boolean newMetricsProxy) { - int port = newMetricsProxy ? 19094 : 19091; + int port = newMetricsProxy ? 19095 : 19091; String[] command = {"vespa-rpc-invoke", "-t", "2", "tcp/localhost:" + port, "setExtraMetrics", wrappedMetrics}; try { dockerOperations.executeCommandInContainerAsRoot(context, 5L, command); 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 416c70fbf10..7bd0cb00c82 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 @@ -680,7 +680,7 @@ public class NodeAgentImplTest { .replaceAll("\\s", "") .replaceAll("\\n", ""); - String[] expectedCommand = {"vespa-rpc-invoke", "-t", "2", "tcp/localhost:19094", "setExtraMetrics", expectedMetrics}; + String[] expectedCommand = {"vespa-rpc-invoke", "-t", "2", "tcp/localhost:19095", "setExtraMetrics", expectedMetrics}; doAnswer(invocation -> { NodeAgentContext calledContainerName = (NodeAgentContext) invocation.getArguments()[0]; long calledTimeout = (long) invocation.getArguments()[1]; @@ -691,7 +691,7 @@ public class NodeAgentImplTest { .replaceAll("([0-9]+\\.[0-9]{1,3})([0-9]*)", "$1"); // Only keep the first 3 decimals // TODO: Remove when old metrics proxy is discontinued. - calledCommand[3] = calledCommand[3].replaceFirst("19091", "19094"); + calledCommand[3] = calledCommand[3].replaceFirst("19091", "19095"); assertEquals(context, calledContainerName); assertEquals(5L, calledTimeout); |