Allow intergroup redundancy

2 files changed, 3 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/RedundancyOnFirstDeploymentValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/RedundancyOnFirstDeploymentValidator.java
index 636a3f44369..e85bbba2dca 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/RedundancyOnFirstDeploymentValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/RedundancyOnFirstDeploymentValidator.java
@@ -31,8 +31,7 @@ public class RedundancyOnFirstDeploymentValidator extends Validator {
         if ( ! deployState.zone().environment().isProduction()) return;
 
         for (ContentCluster cluster : model.getContentClusters().values()) {
-            if (cluster.redundancy().finalRedundancy() == 1
-                && cluster.redundancy().totalNodes() > cluster.redundancy().groups())
+            if (cluster.redundancy().finalRedundancy() == 1 && cluster.redundancy().groups() == 1)
                 deployState.validationOverrides().invalid(ValidationId.redundancyOne,
                                                           cluster + " has redundancy 1, which will cause it to lose data " +
                                                           "if a node fails. This requires an override on first deployment " +
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java
index 7bb01e76b43..879778487f5 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java
@@ -62,10 +62,10 @@ public class GarbageCollectionMetrics {
         for(Iterator<Map.Entry<String, LinkedList<GcStats>>> it = gcStatistics.entrySet().iterator(); it.hasNext(); ) {
             Map.Entry<String, LinkedList<GcStats>> entry = it.next();
             LinkedList<GcStats> history = entry.getValue();
-            while(history.isEmpty() == false && oldestToKeep.isAfter(history.getFirst().when)) {
+            while( ! history.isEmpty() && oldestToKeep.isAfter(history.getFirst().when)) {
                 history.removeFirst();
             }
-            if(history.isEmpty()) {
+            if (history.isEmpty()) {
                 it.remove();
             }
         }