diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-01-02 14:14:52 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-01-02 14:14:52 +0100 |
| commit | 6a7bd6bbba185d7033d0e86faae8c369ed04c59f (patch) | |
| tree | 9196e2200881add82dc5fe80549545228b0c942e /node-admin | |
| parent | dd2362306f4edb773138ad9d6e0e7c99a6b1467e (diff) | |
normalizedVcpu() -> unscaledVcpu()
Diffstat (limited to 'node-admin')
3 files changed, 4 insertions, 4 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java index 33baed7b83f..ecf451b2555 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java @@ -48,7 +48,7 @@ public interface NodeAgentContext extends TaskContext { * * @return node vcpu without the cpu speedup factor. */ - double normalizedVcpu(); + double unscaledVcpu(); /** * This method is the inverse of {@link #pathInNodeFromPathOnHost(Path)}} diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java index 7e8c5080a7e..0d3b02c2bd8 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java @@ -104,7 +104,7 @@ public class NodeAgentContextImpl implements NodeAgentContext { } @Override - public double normalizedVcpu() { + public double unscaledVcpu() { return node.vcpu() / cpuSpeedup; } 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 a461b6df98c..0e651383adc 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 @@ -353,9 +353,9 @@ public class NodeAgentImpl implements NodeAgent { .map(appId -> containerCpuCap.with(FetchVector.Dimension.APPLICATION_ID, appId.serializedForm())) .orElse(containerCpuCap) .with(FetchVector.Dimension.HOSTNAME, context.node().hostname()) - .value() * context.normalizedVcpu(); + .value() * context.unscaledVcpu(); - return ContainerResources.from(cpuCap, context.normalizedVcpu(), context.node().memoryGb()); + return ContainerResources.from(cpuCap, context.unscaledVcpu(), context.node().memoryGb()); } private boolean noCpuCap(ZoneApi zone) { |