Enables SharedVariableAtomicityDetector

core/pom.xml

@@ -47,6 +47,10 @@
       <artifactId>auto-service</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>

core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java

@@ -28,6 +28,8 @@
 import java.util.Set;
 import java.util.SortedSet;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -76,6 +78,7 @@
 
 import com.google.common.base.Preconditions;
 
+@NotThreadSafe
 class RFileScanner extends ScannerOptions implements Scanner {
 
   private static class RFileScannerEnvironmentImpl extends ClientServiceEnvironmentImpl {

core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerOptions.java

@@ -35,6 +35,8 @@
 import java.util.TreeSet;
 import java.util.concurrent.TimeUnit;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.ScannerBase;
 import org.apache.accumulo.core.client.sample.SamplerConfiguration;
@@ -46,6 +48,7 @@
 import org.apache.accumulo.core.util.TextUtil;
 import org.apache.hadoop.io.Text;
 
+@NotThreadSafe
 public class ScannerOptions implements ScannerBase {
 
   protected List<IterInfo> serverSideIteratorList = Collections.emptyList();

core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java

@@ -45,6 +45,8 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.SampleNotPresentException;
@@ -355,6 +357,7 @@ private String getTableInfo() {
     return context.getPrintableTableInfoFromId(tableId);
   }
 
+  @NotThreadSafe
   private class QueryTask implements Runnable {
 
     private final String tsLocation;

core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportPool.java

@@ -41,6 +41,8 @@
 import java.util.function.LongSupplier;
 import java.util.function.Supplier;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.rpc.ThriftUtil;
 import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
 import org.apache.accumulo.core.util.HostAndPort;
@@ -577,6 +579,7 @@ public TransportPoolShutdownException(String msg) {
     private static final long serialVersionUID = 1L;
   }
 
+  @NotThreadSafe
   private static class CachedTTransport extends TTransport {
 
     private final ThriftTransportKey cacheKey;

core/src/main/java/org/apache/accumulo/core/crypto/streams/BlockedInputStream.java

@@ -23,10 +23,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 /**
  * Reader corresponding to BlockedOutputStream. Expects all data to be in the form of size (int)
  * data (size bytes) junk (however many bytes it takes to complete a block)
  */
+@NotThreadSafe
 public class BlockedInputStream extends InputStream {
   byte[] array;
   // ReadPos is where to start reading

core/src/main/java/org/apache/accumulo/core/fate/zookeeper/DistributedReadWriteLock.java

@@ -30,6 +30,8 @@
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -107,6 +109,7 @@ public interface QueueLock {
 
   private static final Logger log = LoggerFactory.getLogger(DistributedReadWriteLock.class);
 
+  @NotThreadSafe
   static class ReadLock implements Lock {
 
     QueueLock qlock;

core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java

@@ -35,6 +35,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.bloomfilter.DynamicBloomFilter;
 import org.apache.accumulo.core.classloader.ClassLoaderUtil;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
@@ -346,6 +348,7 @@ public void close() {
     }
   }
 
+  @NotThreadSafe
   public static class Reader implements FileSKVIterator {
 
     private final BloomFilterLoader bfl;

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

@@ -23,12 +23,15 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * This class is like byte array input stream with two differences. It supports seeking and avoids
  * synchronization.
  */
+@NotThreadSafe
 public class SeekableByteArrayInputStream extends InputStream {
 
   // making this volatile for the following case

core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java

@@ -24,6 +24,8 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -43,6 +45,7 @@
 public class MapFileOperations extends FileOperations {
   private static final String MSG = "Map files are not supported";
 
+  @NotThreadSafe
   public static class RangeIterator implements FileSKVIterator {
 
     SortedKeyValueIterator<Key,Value> reader;

core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java

@@ -40,6 +40,8 @@
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.client.SampleNotPresentException;
 import org.apache.accumulo.core.client.sample.Sampler;
 import org.apache.accumulo.core.client.sample.SamplerConfiguration;
@@ -557,6 +559,7 @@ public void close() throws IOException {
     }
   }
 
+  @NotThreadSafe
   public static class Writer implements FileSKVWriter {
 
     public static final int MAX_CF_IN_DLG = 1000;
@@ -754,6 +757,7 @@ public long getLength() {
     }
   }
 
+  @NotThreadSafe
   private static class LocalityGroupReader extends LocalityGroup implements FileSKVIterator {
 
     private final CachableBlockFile.Reader reader;

core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/SimpleBufferedOutputStream.java

@@ -22,10 +22,13 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 /**
  * A simplified BufferedOutputStream with borrowed buffer, and allow users to see how much data have
  * been buffered.
  */
+@NotThreadSafe
 class SimpleBufferedOutputStream extends FilterOutputStream {
   protected byte[] buf; // the borrowed buffer
   protected int count = 0; // bytes used in buffer.

core/src/main/java/org/apache/accumulo/core/file/streams/BoundedRangeFileInputStream.java

@@ -21,13 +21,16 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.hadoop.fs.Seekable;
 
 /**
  * BoundedRangeFIleInputStream abstracts a contiguous region of a Hadoop FSDataInputStream as a
  * regular input stream. One can create multiple BoundedRangeFileInputStream on top of the same
  * FSDataInputStream and they would not interfere with each other.
  */
+@NotThreadSafe
 public class BoundedRangeFileInputStream extends InputStream {
 
   private volatile boolean closed = false;

core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/ColumnFamilySkippingIterator.java

@@ -25,6 +25,8 @@
 import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Column;
 import org.apache.accumulo.core.data.Key;
@@ -36,6 +38,7 @@
 import org.apache.accumulo.core.iterators.ServerSkippingIterator;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 
+@NotThreadSafe
 public class ColumnFamilySkippingIterator extends ServerSkippingIterator
     implements InterruptibleIterator {
 

core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/StatsIterator.java

@@ -26,6 +26,8 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.LongAdder;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -34,6 +36,7 @@
 import org.apache.accumulo.core.iterators.ServerWrappingIterator;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 
+@NotThreadSafe
 public class StatsIterator extends ServerWrappingIterator {
 
   private int numRead = 0;

core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletsMetadata.java

@@ -44,6 +44,8 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.BatchScanner;
 import org.apache.accumulo.core.client.IsolatedScanner;
@@ -89,6 +91,7 @@
  */
 public class TabletsMetadata implements Iterable<TabletMetadata>, AutoCloseable {
 
+  @NotThreadSafe
   public static class Builder implements TableRangeOptions, TableOptions, RangeOptions, Options {
 
     private final List<Text> families = new ArrayList<>();

core/src/main/java/org/apache/accumulo/core/singletons/SingletonManager.java

@@ -27,6 +27,8 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * This class automates management of static singletons that maintain state for Accumulo clients.
  * Historically, Accumulo client code that used Connector had no control over these singletons. The
@@ -81,6 +83,8 @@ public enum Mode {
   private static List<SingletonService> services;
 
   @VisibleForTesting
+  @SuppressFBWarnings(value = "AT_NONATOMIC_64BIT_PRIMITIVE",
+      justification = "only called in static init block and testing, no sync needed")
   static void reset() {
     reservations = 0;
     mode = Mode.CLIENT;

core/src/main/java/org/apache/accumulo/core/spi/compaction/DefaultCompactionPlanner.java

@@ -169,8 +169,10 @@ public String toString() {
   private int maxFilesToCompact;
   private double lowestRatio;
 
-  @SuppressFBWarnings(value = {"UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD"},
-      justification = "Field is written by Gson")
+  @SuppressFBWarnings(
+      value = {"UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD", "AT_NONATOMIC_64BIT_PRIMITIVE"},
+      justification = "UWF_UNWRITTEN_FIELD and NP_UNWRITTEN_FIELD: Field is written by Gson. "
+          + "AT_NONATOMIC_64BIT_PRIMITIVE: Fields modified here are initialized once, and read-only after.")
   @Override
   public void init(InitParameters params) {
 
@@ -243,6 +245,8 @@ public void init(InitParameters params) {
   }
 
   @SuppressWarnings("removal")
+  @SuppressFBWarnings(value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
+      justification = "only called in init")
   private void determineMaxFilesToCompact(InitParameters params) {
     String fqo = params.getFullyQualifiedOption("maxOpen");
     if (!params.getServiceEnvironment().getConfiguration().isSet(fqo)

core/src/main/java/org/apache/accumulo/core/spi/crypto/AESCryptoService.java

@@ -117,6 +117,8 @@ protected Cipher initialValue() {
   };
 
   @Override
+  @SuppressFBWarnings(value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
+      justification = "Fields modified here are initialized once, and read-only after.")
   public void init(Map<String,String> conf) throws CryptoException {
     ensureNotInit();
     String keyLocation = Objects.requireNonNull(conf.get(KEY_URI_PROPERTY),

core/src/main/java/org/apache/accumulo/core/util/CountingInputStream.java

@@ -18,6 +18,8 @@
 import java.io.InputStream;
 import java.util.Objects;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 /**
  * This class was copied from Guava and modified. If this class was not final in Guava it could have
  * been extended. Guava has issue 590 open about this.
@@ -26,6 +28,7 @@
  *
  * @author Chris Nokleberg
  */
+@NotThreadSafe
 public final class CountingInputStream extends FilterInputStream {
 
   private long count;

pom.xml

@@ -781,7 +781,7 @@ under the License.
             <includeTests>true</includeTests>
             <maxHeap>1024</maxHeap>
             <maxRank>16</maxRank>
-            <omitVisitors>ConstructorThrow,SharedVariableAtomicityDetector</omitVisitors>
+            <omitVisitors>ConstructorThrow</omitVisitors>
             <jvmArgs>-Dcom.overstock.findbugs.ignore=com.google.common.util.concurrent.RateLimiter,com.google.common.hash.Hasher,com.google.common.hash.HashCode,com.google.common.hash.HashFunction,com.google.common.hash.Hashing,com.google.common.cache.Cache,com.google.common.io.CountingOutputStream,com.google.common.io.ByteStreams,com.google.common.cache.LoadingCache,com.google.common.base.Stopwatch,com.google.common.cache.RemovalNotification,com.google.common.util.concurrent.Uninterruptibles,com.google.common.reflect.ClassPath,com.google.common.reflect.ClassPath$ClassInfo,com.google.common.base.Throwables,com.google.common.collect.Iterators</jvmArgs>
             <plugins combine.children="append">
               <plugin>

server/base/pom.xml

@@ -44,6 +44,10 @@
       <artifactId>auto-service</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>

server/base/src/main/java/org/apache/accumulo/server/compaction/CountingIterator.java

@@ -23,12 +23,15 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.WrappingIterator;
 
+@NotThreadSafe
 public class CountingIterator extends WrappingIterator {
 
   private long count;

server/base/src/main/java/org/apache/accumulo/server/fs/FileManager.java

@@ -33,6 +33,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
+import javax.annotation.concurrent.NotThreadSafe;
+
 import org.apache.accumulo.core.client.SampleNotPresentException;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.Key;
@@ -386,6 +388,7 @@ private void releaseReaders(KeyExtent tablet, List<FileSKVIterator> readers,
 
   }
 
+  @NotThreadSafe
   static class FileDataSource implements DataSource {
 
     private SortedKeyValueIterator<Key,Value> iter;