Merge branch '3.1' into zkchroot-postzkclean

Author: ctubbsii

core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java

@@ -49,6 +49,8 @@
 
 import com.github.benmanes.caffeine.cache.Cache;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * This is a wrapper class for BCFile that includes a cache for independent caches for datablocks
  * and metadatablocks
@@ -342,6 +344,8 @@ public Map<String,Loader> getDependencies() {
         return Collections.emptyMap();
       }
 
+      @SuppressFBWarnings(value = {"NP_LOAD_OF_KNOWN_NULL_VALUE"},
+          justification = "Spotbugs false positive, see spotbugs issue 2836.")
       @Override
       public byte[] load(int maxSize, Map<String,byte[]> dependencies) {
 
@@ -356,23 +360,18 @@ public byte[] load(int maxSize, Map<String,byte[]> dependencies) {
             }
           }
 
-          BlockReader _currBlock = getBlockReader(maxSize, reader);
-          if (_currBlock == null) {
-            return null;
-          }
+          try (BlockReader _currBlock = getBlockReader(maxSize, reader)) {
+            if (_currBlock == null) {
+              return null;
+            }
 
-          byte[] b = null;
-          try {
-            b = new byte[(int) _currBlock.getRawSize()];
+            byte[] b = new byte[(int) _currBlock.getRawSize()];
             _currBlock.readFully(b);
+            return b;
           } catch (IOException e) {
             log.debug("Error full blockRead for file " + cacheId + " for block " + getBlockId(), e);
             throw new UncheckedIOException(e);
-          } finally {
-            _currBlock.close();
           }
-
-          return b;
         } catch (IOException e) {
           throw new UncheckedIOException(e);
         }

server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/CompactionExecutorsMetrics.java

@@ -50,16 +50,29 @@ public class CompactionExecutorsMetrics implements MetricsProducer {
   private volatile List<CeMetrics> ceMetricsList = List.of();
   private final Map<CompactionExecutorId,CeMetrics> ceMetricsMap = new HashMap<>();
   private final Map<CompactionExecutorId,ExMetrics> exCeMetricsMap = new HashMap<>();
-  private MeterRegistry registry = null;
+  private volatile MeterRegistry registry = null;
 
   // public so it can be closed by outside callers
-  public static class CeMetrics implements AutoCloseable {
-    private AtomicInteger queued;
-    private AtomicInteger running;
+  public class CeMetrics implements AutoCloseable {
+    private final AtomicInteger queued;
+    private final AtomicInteger running;
 
     private IntSupplier runningSupplier;
     private IntSupplier queuedSupplier;
 
+    private CeMetrics(CompactionExecutorId ceid) {
+      if (registry != null) {
+        this.queued = registry.gauge(MAJC_QUEUED.getName(), Tags.of("id", ceid.canonical()),
+            new AtomicInteger(0));
+        this.running = registry.gauge(MAJC_RUNNING.getName(), Tags.of("id", ceid.canonical()),
+            new AtomicInteger(0));
+      } else {
+        // these vars have no effect on metrics in this case - just avoids NPEs
+        this.queued = new AtomicInteger(0);
+        this.running = new AtomicInteger(0);
+      }
+    }
+
     @Override
     public void close() {
       runningSupplier = () -> 0;
@@ -69,9 +82,22 @@ public void close() {
     }
   }
 
-  private static class ExMetrics {
-    AtomicInteger queued;
-    AtomicInteger running;
+  private class ExMetrics {
+    private final AtomicInteger queued;
+    private final AtomicInteger running;
+
+    private ExMetrics(CompactionExecutorId ceid) {
+      if (registry != null) {
+        this.queued = registry.gauge(MAJC_QUEUED.getName(), Tags.of("id", ceid.canonical()),
+            new AtomicInteger(0));
+        this.running = registry.gauge(MAJC_RUNNING.getName(), Tags.of("id", ceid.canonical()),
+            new AtomicInteger(0));
+      } else {
+        // these vars have no effect on metrics in this case - just avoids NPEs
+        this.queued = new AtomicInteger(0);
+        this.running = new AtomicInteger(0);
+      }
+    }
   }
 
   public CompactionExecutorsMetrics() {
@@ -88,16 +114,7 @@ public synchronized CeMetrics addExecutor(CompactionExecutorId ceid, IntSupplier
 
     synchronized (ceMetricsMap) {
 
-      CeMetrics cem = ceMetricsMap.computeIfAbsent(ceid, id -> {
-        CeMetrics m = new CeMetrics();
-        if (registry != null) {
-          m.queued = registry.gauge(MAJC_QUEUED.getName(), Tags.of("id", ceid.canonical()),
-              new AtomicInteger(0));
-          m.running = registry.gauge(MAJC_RUNNING.getName(), Tags.of("id", ceid.canonical()),
-              new AtomicInteger(0));
-        }
-        return m;
-      });
+      CeMetrics cem = ceMetricsMap.computeIfAbsent(ceid, id -> new CeMetrics(ceid));
 
       cem.runningSupplier = runningSupplier;
       cem.queuedSupplier = queuedSupplier;
@@ -119,16 +136,7 @@ public void update() {
         externalMetricsSupplier.get().forEach(ecm -> {
           seenIds.add(ecm.ceid);
 
-          ExMetrics exm = exCeMetricsMap.computeIfAbsent(ecm.ceid, id -> {
-            ExMetrics m = new ExMetrics();
-            if (registry != null) {
-              m.queued = registry.gauge(MAJC_QUEUED.getName(), Tags.of("id", ecm.ceid.canonical()),
-                  new AtomicInteger(0));
-              m.running = registry.gauge(MAJC_RUNNING.getName(),
-                  Tags.of("id", ecm.ceid.canonical()), new AtomicInteger(0));
-            }
-            return m;
-          });
+          ExMetrics exm = exCeMetricsMap.computeIfAbsent(ecm.ceid, id -> new ExMetrics(ecm.ceid));
 
           exm.queued.set(ecm.queued);
           exm.running.set(ecm.running);