Merge branch '3.1' into 3.1-feature-4892

assemble/conf/log4j2-service.properties

@@ -71,6 +71,9 @@ appender.monitor.type = AccumuloMonitor
 appender.monitor.name = MonitorLog
 appender.monitor.filter.threshold.type = ThresholdFilter
 appender.monitor.filter.threshold.level = warn
+#appender.monitor.async = true
+#appender.monitor.maxThreads = 2
+#appender.monitor.queueSize = 1024
 
 logger.zookeeper.name = org.apache.zookeeper
 logger.zookeeper.level = error

assemble/conf/log4j2.properties

@@ -33,6 +33,12 @@ appender.console.layout.pattern = %style{%d{ISO8601}}{dim,cyan} %style{[}{red}%s
 logger.shellaudit.name = org.apache.accumulo.shell.Shell.audit
 logger.shellaudit.level = warn
 
+logger.core.name = org.apache.accumulo.core
+logger.core.level = info
+
+logger.shell.name = org.apache.accumulo.shell.Shell
+logger.shell.level = info
+
 logger.zookeeper.name = org.apache.zookeeper
 logger.zookeeper.level = error
 

core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java

@@ -48,7 +48,10 @@ public interface ScannerBase extends Iterable<Entry<Key,Value>>, AutoCloseable {
    * Consistency level for the scanner. The default level is IMMEDIATE, which means that this
    * scanner will see keys and values that have been successfully written to a TabletServer.
    * EVENTUAL means that the scanner may not see the latest data that was written to a TabletServer,
-   * but may instead see an older version of data.
+   * but may instead see an older version of data. To use the EVENTUAL consistency level, ScanServer
+   * processes must be running. If not specifically configured, clients will use the default
+   * settings ({@code ConfigurableScanServerSelector#PROFILES_DEFAULT}). See
+   * {@code ConfigurableScanServerSelector} for information on how to configure the client.
    *
    * @since 2.1.0
    */

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

@@ -615,8 +615,6 @@ private ScanServerData rebinToScanServers(Map<String,Map<KeyExtent,List<Range>>>
     // get a snapshot of this once,not each time the plugin request it
     var scanAttemptsSnapshot = scanAttempts.snapshot();
 
-    Duration timeoutLeft = Duration.ofMillis(retryTimeout - startTime.elapsed(MILLISECONDS));
-
     ScanServerSelector.SelectorParameters params = new ScanServerSelector.SelectorParameters() {
       @Override
       public Collection<TabletId> getTablets() {
@@ -636,6 +634,7 @@ public Map<String,String> getHints() {
       @Override
       public <T> Optional<T> waitUntil(Supplier<Optional<T>> condition, Duration maxWaitTime,
           String description) {
+        Duration timeoutLeft = Duration.ofMillis(retryTimeout - startTime.elapsed(MILLISECONDS));
         return ThriftScanner.waitUntil(condition, maxWaitTime, description, timeoutLeft, context,
             tableId, log);
       }

core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/Bulk.java

@@ -42,6 +42,7 @@ public static class Mapping {
     private Collection<FileInfo> files;
 
     // Gson requires a default constructor when JDK Unsafe usage is disabled
+    @SuppressWarnings("unused")
     private Mapping() {}
 
     public Mapping(KeyExtent tablet, Files files) {
@@ -71,6 +72,7 @@ public static class Tablet {
     private byte[] prevEndRow;
 
     // Gson requires a default constructor when JDK Unsafe usage is disabled
+    @SuppressWarnings("unused")
     private Tablet() {}
 
     public Tablet(Text endRow, Text prevEndRow) {
@@ -111,6 +113,7 @@ public static class FileInfo {
     long estEntries;
 
     // Gson requires a default constructor when JDK Unsafe usage is disabled
+    @SuppressWarnings("unused")
     private FileInfo() {}
 
     public FileInfo(String fileName, long estFileSize, long estNumEntries) {

core/src/main/java/org/apache/accumulo/core/conf/Property.java

@@ -30,6 +30,7 @@
 
 import org.apache.accumulo.core.classloader.ClassLoaderUtil;
 import org.apache.accumulo.core.data.constraints.NoDeleteConstraint;
+import org.apache.accumulo.core.file.blockfile.cache.tinylfu.TinyLfuBlockCacheManager;
 import org.apache.accumulo.core.file.rfile.RFile;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iteratorsImpl.system.DeletingIterator;
@@ -132,7 +133,7 @@ public enum Property {
           + " everywhere. Before using the ChangeSecret tool, make sure Accumulo is not"
           + " running and you are logged in as the user that controls Accumulo files in"
           + " HDFS. To use the ChangeSecret tool, run the command: `./bin/accumulo"
-          + " org.apache.accumulo.server.util.ChangeSecret`.",
+          + " admin changeSecret`.",
       "1.3.5"),
   INSTANCE_VOLUMES("instance.volumes", "", PropertyType.STRING,
       "A comma separated list of dfs uris to use. Files will be stored across"
@@ -170,11 +171,6 @@ public enum Property {
           + "other reserved characters in a URI use standard URI hex encoding. For "
           + "example replace commas with %2C.",
       "1.6.0"),
-  INSTANCE_VOLUMES_UPGRADE_RELATIVE("instance.volumes.upgrade.relative", "", PropertyType.STRING,
-      "The volume dfs uri containing relative tablet file paths. Relative paths may exist in the metadata from "
-          + "versions prior to 1.6. This property is only required if a relative path is detected "
-          + "during the upgrade process and will only be used once.",
-      "2.1.0"),
   @Experimental // interface uses unstable internal types, use with caution
   INSTANCE_SECURITY_AUTHENTICATOR("instance.security.authenticator",
       "org.apache.accumulo.server.security.handler.ZKAuthenticator", PropertyType.CLASSNAME,
@@ -504,11 +500,8 @@ public enum Property {
       "Time to wait for clients to continue scans before closing a session.", "1.3.5"),
   TSERV_DEFAULT_BLOCKSIZE("tserver.default.blocksize", "1M", PropertyType.BYTES,
       "Specifies a default blocksize for the tserver caches.", "1.3.5"),
-  TSERV_CACHE_MANAGER_IMPL("tserver.cache.manager.class",
-      "org.apache.accumulo.core.file.blockfile.cache.lru.LruBlockCacheManager", PropertyType.STRING,
-      "Specifies the class name of the block cache factory implementation."
-          + " Alternative implementation is"
-          + " org.apache.accumulo.core.file.blockfile.cache.tinylfu.TinyLfuBlockCacheManager.",
+  TSERV_CACHE_MANAGER_IMPL("tserver.cache.manager.class", TinyLfuBlockCacheManager.class.getName(),
+      PropertyType.STRING, "Specifies the class name of the block cache factory implementation.",
       "2.0.0"),
   TSERV_DATACACHE_SIZE("tserver.cache.data.size", "10%", PropertyType.MEMORY,
       "Specifies the size of the cache for RFile data blocks.", "1.3.5"),

core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheManager.java

@@ -24,6 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Deprecated(since = "3.1.0")
 public class LruBlockCacheManager extends BlockCacheManager {
 
   private static final Logger LOG = LoggerFactory.getLogger(LruBlockCacheManager.class);
@@ -32,6 +33,7 @@ public class LruBlockCacheManager extends BlockCacheManager {
   protected BlockCache createCache(Configuration conf, CacheType type) {
     LruBlockCacheConfiguration cc = new LruBlockCacheConfiguration(conf, type);
     LOG.info("Creating {} cache with configuration {}", type, cc);
+    LOG.warn("This cache implementation is deprecated and will be remove in future releases.");
     return new LruBlockCache(cc);
   }
 

core/src/main/java/org/apache/accumulo/core/lock/ServiceLockData.java

@@ -242,6 +242,7 @@ private static class ServiceDescriptorGson {
     private String group;
 
     // default constructor required for Gson
+    @SuppressWarnings("unused")
     public ServiceDescriptorGson() {}
 
     public ServiceDescriptorGson(UUID uuid, ThriftService service, String address, String group) {

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

@@ -81,6 +81,7 @@ private static class Extent {
     String per;
 
     // Gson requires a default constructor
+    @SuppressWarnings("unused")
     private Extent() {}
 
     Extent(KeyExtent extent) {

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

@@ -262,8 +262,9 @@ public static class LastLocationColumnFamily {
      */
     public static class SuspendLocationColumn {
       public static final String STR_NAME = "suspend";
-      public static final ColumnFQ SUSPEND_COLUMN =
-          new ColumnFQ(new Text(STR_NAME), new Text("loc"));
+      public static final Text NAME = new Text(STR_NAME);
+      public static final String SUSPEND_QUAL = "loc";
+      public static final ColumnFQ SUSPEND_COLUMN = new ColumnFQ(NAME, new Text(SUSPEND_QUAL));
     }
 
     /**