diff options
| author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-07-05 21:46:44 +0000 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-07-05 21:46:44 +0000 |
| commit | 4d81b167dcc1890c81858d5da4ac8d1dcbdf9f6f (patch) | |
| tree | 7a9a30b9a534972d22932855ae5bdc24794f4f51 /node-admin | |
| parent | 95afaae2eaabdf33761168c2caeffe77a7970040 (diff) | |
Use new program names.
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/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index 8169b9daee8..4416c412d61 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 @@ -579,7 +579,7 @@ public class NodeAgentImpl implements NodeAgent { String wrappedMetrics = "s:" + params.toString(); // Push metrics to the metrics proxy in each container - give it maximum 1 seconds to complete - String[] command = {"rpc_invoke", "-t", "2", "tcp/localhost:19091", "setExtraMetrics", wrappedMetrics}; + String[] command = {"vespa-rpc-invoke", "-t", "2", "tcp/localhost:19091", "setExtraMetrics", wrappedMetrics}; dockerOperations.executeCommandInContainerAsRoot(containerName, 5L, command); } catch (DockerExecTimeoutException | JsonProcessingException e) { logger.warning("Unable to push metrics to container: " + containerName, e); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java index 8d20f4acb5d..aa1ffca2d46 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java @@ -227,7 +227,7 @@ public class LocalZoneUtils { } } System.out.println("prepare " + applicationName); - final String deployPath = getDefaults().underVespaHome("bin/deploy"); + final String deployPath = getDefaults().underVespaHome("bin/vespa-deploy"); ProcessResult copyProcess = docker.executeInContainer(CONFIG_SERVER_CONTAINER_NAME, deployPath, "-e", tenantName, "-a", applicationName, "prepare", pathToAppOnConfigServer.toString()); if (! copyProcess.isSuccess()) { 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 0264e2ac102..9bc8f4fadc1 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 @@ -540,7 +540,7 @@ public class NodeAgentImplTest { .replaceAll("\\s", "") .replaceAll("\\n", ""); - String[] expectedCommand = {"rpc_invoke", "-t", "2", "tcp/localhost:19091", "setExtraMetrics", expectedMetrics}; + String[] expectedCommand = {"vespa-rpc-invoke", "-t", "2", "tcp/localhost:19091", "setExtraMetrics", expectedMetrics}; doAnswer(invocation -> { ContainerName calledContainerName = (ContainerName) invocation.getArguments()[0]; long calledTimeout = (long) invocation.getArguments()[1]; |