Add has... methods to ClusterType

4 files changed, 7 insertions, 5 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeMembership.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeMembership.java
index 3b608b203e9..6fe5ef47eb5 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeMembership.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeMembership.java
@@ -83,9 +83,11 @@ public class NodeMembership {
         }
 
         public boolean isAdmin() { return "admin".equals(type); }
-        public boolean isContent() { return "content".equals(type) || isCombined(); }
+        public boolean isContent() { return "content".equals(type); }
         public boolean isCombined() { return "combined".equals(type); }
-        public boolean isContainer() { return "container".equals(type) || isCombined(); }
+        public boolean isContainer() { return "container".equals(type); }
+        public boolean hasContainer() { return isContainer() || isCombined(); }
+        public boolean hasContent() { return isContent() || isCombined(); }
 
         public String value() {
             return type;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperationsImpl.java
index ed130105fff..480e78c2399 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperationsImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperationsImpl.java
@@ -98,7 +98,7 @@ public class ContainerOperationsImpl implements ContainerOperations {
         if (context.nodeType() != NodeType.proxy && context.nodeType() != NodeType.controller)
             command.withSecurityOpt("no-new-privileges");
 
-        if (context.node().membership().map(m -> m.type().isContent()).orElse(false))
+        if (context.node().membership().map(m -> m.type().hasContent()).orElse(false))
             command.withSecurityOpt("seccomp=unconfined");
 
         ContainerNetworkMode networkMode = context.networkMode();
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 d52ad7529c5..5be6c660dd5 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
@@ -149,7 +149,7 @@ public class StorageMaintainer {
 
         rules.add(CoredumpCleanupRule.forContainer(pathOnHostUnderContainerVespaHome(context, "var/crash")));
 
-        if (context.node().membership().map(m -> m.type().isContainer()).orElse(false))
+        if (context.node().membership().map(m -> m.type().hasContainer()).orElse(false))
             rules.add(new LinearCleanupRule(() -> FileFinder.files(pathOnHostUnderContainerVespaHome(context, "logs/vespa/qrs")).list(),
                     fa -> monthNormalizer.apply(fa.lastModifiedTime()), Priority.LOWEST, Priority.HIGHEST));
 
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 3133a5568f7..f401b614637 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
@@ -618,7 +618,7 @@ public class NodeAgentImpl implements NodeAgent {
         return zone.getSystemName().isCd()
                || zone.getEnvironment().isTest()
                || context.nodeType() != NodeType.tenant
-               || membership.map(mem -> ! (mem.type().isContainer() || mem.type().isAdmin())).orElse(false)
+               || membership.map(mem -> ! (mem.type().hasContainer() || mem.type().isAdmin())).orElse(false)
                 ? Duration.ofSeconds(-1)
                 : warmUpDuration;
     }