Merge pull request #14155 from vespa-engine/bratseth/avoid-manual-zone-noise

Reduce noise 

3 files changed, 14 insertions, 13 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/JuniperSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/JuniperSearcher.java
index d11b8d86d29..4e4b4600814 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/JuniperSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/JuniperSearcher.java
@@ -46,14 +46,11 @@ public class JuniperSearcher extends Searcher {
 
     private static final String ELLIPSIS = "...";
 
-    // The name of the field containing document type
-    private static final String MAGIC_FIELD = Hit.SDDOCNAME_FIELD;
-
     public static final String JUNIPER_TAG_REPLACING = "JuniperTagReplacing";
 
-    private String boldOpenTag;
-    private String boldCloseTag;
-    private String separatorTag;
+    private final String boldOpenTag;
+    private final String boldCloseTag;
+    private final String separatorTag;
 
     @Inject
     public JuniperSearcher(ComponentId id, QrSearchersConfig config) {
@@ -80,13 +77,13 @@ public class JuniperSearcher extends Searcher {
         int worstCase = result.getHitCount();
         List<Hit> hits = new ArrayList<>(worstCase);
         for (Iterator<Hit> i = result.hits().deepIterator(); i.hasNext();) {
-            Hit sniffHit = i.next();
-            if ( ! (sniffHit instanceof FastHit)) continue;
+            Hit hit = i.next();
+            if ( ! (hit instanceof FastHit)) continue;
 
-            FastHit hit = (FastHit) sniffHit;
-            if (hit.isFilled(summaryClass)) continue;
+            FastHit fastHit = (FastHit)hit;
+            if (fastHit.isFilled(summaryClass)) continue;
 
-            hits.add(hit);
+            hits.add(fastHit);
         }
         execution.fill(result, summaryClass);
         highlight(result.getQuery().getPresentation().getBolding(), hits.iterator(), summaryClass,
@@ -102,7 +99,7 @@ public class JuniperSearcher extends Searcher {
             FastHit fastHit = (FastHit) hit;
             if (summaryClass != null &&  ! fastHit.isFilled(summaryClass)) continue;
 
-            Object searchDefinitionField = fastHit.getField(MAGIC_FIELD);
+            Object searchDefinitionField = fastHit.getField(Hit.SDDOCNAME_FIELD);
             if (searchDefinitionField == null) continue;
 
             for (Index index : indexFacts.getIndexes(searchDefinitionField.toString())) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java
index 222ee631968..dd5a62f3167 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java
@@ -48,6 +48,10 @@ public class NodeMetricsDbMaintainer extends NodeRepositoryMaintainer {
             }
         }
         nodeMetricsDb.gc(nodeRepository().clock());
+
+        // Suppress failures for manual zones for now to avoid noise
+        if (nodeRepository().zone().environment().isManuallyDeployed()) return true;
+
         return warnings == 0;
     }
 
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java
index eb9b91c812c..b1d6fd99333 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java
@@ -74,7 +74,7 @@ public abstract class Maintainer implements Runnable, AutoCloseable {
     @Override
     public final String toString() { return name(); }
 
-    /** Called once each time this maintenance job should run. Returns whether the maintenance run was succesful */
+    /** Called once each time this maintenance job should run. Returns whether the maintenance run was successful */
     protected abstract boolean maintain();
 
     /** Returns the interval at which this job is set to run */