diff options
| author | Valerij Fredriksen <valerijf@oath.com> | 2018-10-18 09:30:23 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@oath.com> | 2018-10-18 09:30:23 +0200 |
| commit | ececb052deff9e7f49999c0a55d1f37a872c8a99 (patch) | |
| tree | 1627f3ed343fd16044bd06f826f13b2b3fd357c1 /node-admin | |
| parent | 964c29dedaac01b512f84bd10f4d7b62ce1c2af4 (diff) | |
zone() -> zoneId()
Diffstat (limited to 'node-admin')
3 files changed, 5 insertions, 5 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java index be41cf522fb..2b235ac9867 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java @@ -140,7 +140,7 @@ public class StorageMaintainer { .withTag("flavor", node.getFlavor()) .withTag("canonicalFlavor", node.getCanonicalFlavor()) .withTag("state", node.getState().toString()) - .withTag("zone", String.format("%s.%s", context.zone().environment().value(), context.zone().regionName().value())); + .withTag("zone", String.format("%s.%s", context.zoneId().environment().value(), context.zoneId().regionName().value())); node.getParentHostname().ifPresent(parent -> check.withTag("parentHostname", parent)); node.getOwner().ifPresent(owner -> check .withTag("tenantName", owner.getTenant()) @@ -227,8 +227,8 @@ public class StorageMaintainer { private Map<String, Object> getCoredumpNodeAttributes(NodeAgentContext context, NodeSpec node, Optional<Container> container) { Map<String, Object> attributes = new HashMap<>(); attributes.put("hostname", node.getHostname()); - attributes.put("region", context.zone().regionName()); - attributes.put("environment", context.zone().environment()); + attributes.put("region", context.zoneId().regionName()); + attributes.put("environment", context.zoneId().environment()); attributes.put("flavor", node.getFlavor()); attributes.put("kernel_version", System.getProperty("os.version")); 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 2553e20c7ba..2025d422331 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 @@ -23,7 +23,7 @@ public interface NodeAgentContext extends TaskContext { DockerNetworking dockerNetworking(); - ZoneId zone(); + ZoneId zoneId(); /** 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 b2fa1922e5e..d1b5ec77c6a 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 @@ -74,7 +74,7 @@ public class NodeAgentContextImpl implements NodeAgentContext { } @Override - public ZoneId zone() { + public ZoneId zoneId() { return zoneId; } |