Merge branch 'main' into accumulo-5160-2

Author: cshannon

core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java

@@ -18,6 +18,7 @@
  */
 package org.apache.accumulo.core.client.admin;
 
+import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -357,4 +358,14 @@ boolean testClassLoad(final String className, final String asTypeName)
    * @since 2.1.0
    */
   InstanceId getInstanceId();
+
+  /**
+   * Return the current manager time. This duration represents the amount of time an accumulo
+   * manager process has been running. The duration is persisted and should only increase over the
+   * lifetime of an Accumulo instance.
+   *
+   * @return current time
+   * @since 4.0.0
+   */
+  Duration getManagerTime() throws AccumuloException, AccumuloSecurityException;
 }

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

@@ -95,8 +95,6 @@
 import org.apache.accumulo.core.rpc.SslConnectionParams;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
-import org.apache.accumulo.core.singletons.SingletonManager;
-import org.apache.accumulo.core.singletons.SingletonReservation;
 import org.apache.accumulo.core.spi.common.ServiceEnvironment;
 import org.apache.accumulo.core.spi.scan.ScanServerInfo;
 import org.apache.accumulo.core.spi.scan.ScanServerSelector;
@@ -137,6 +135,7 @@ public class ClientContext implements AccumuloClient {
   private ConditionalWriterConfig conditionalWriterConfig;
   private final AccumuloConfiguration accumuloConf;
   private final Configuration hadoopConf;
+  private final HashMap<TableId,ClientTabletCache> tabletCaches = new HashMap<>();
 
   // These fields are very frequently accessed (each time a connection is created) and expensive to
   // compute, so cache them.
@@ -156,7 +155,6 @@ public class ClientContext implements AccumuloClient {
   private final TableOperationsImpl tableops;
   private final NamespaceOperations namespaceops;
   private InstanceOperations instanceops = null;
-  private final SingletonReservation singletonReservation;
   private final ThreadPools clientThreadPools;
   private ThreadPoolExecutor cleanupThreadPool;
   private ThreadPoolExecutor scannerReadaheadPool;
@@ -223,27 +221,24 @@ public String getGroup() {
   }
 
   /**
-   * Create a client context with the provided configuration. Legacy client code must provide a
-   * no-op SingletonReservation to preserve behavior prior to 2.x. Clients since 2.x should call
-   * Accumulo.newClient() builder, which will create a client reservation in
-   * {@link ClientBuilderImpl#buildClient}
+   * Create a client context with the provided configuration. Clients should call
+   * Accumulo.newClient() builder
    */
-  public ClientContext(SingletonReservation reservation, ClientInfo info,
-      AccumuloConfiguration serverConf, UncaughtExceptionHandler ueh) {
+  public ClientContext(ClientInfo info, AccumuloConfiguration serverConf,
+      UncaughtExceptionHandler ueh) {
     this.info = info;
     this.hadoopConf = info.getHadoopConf();
 
     this.zooSession = memoize(() -> {
-      var zk = info
-          .getZooKeeperSupplier(getClass().getSimpleName() + "(" + info.getPrincipal() + ")", "")
-          .get();
+      var zk =
+          info.getZooKeeperSupplier(getClass().getSimpleName() + "(" + info.getPrincipal() + ")",
+              ZooUtil.getRoot(getInstanceID())).get();
       zooKeeperOpened.set(true);
       return zk;
     });
 
     this.zooCache = memoize(() -> {
-      var zc = new ZooCache(getZooSession(),
-          createPersistentWatcherPaths(ZooUtil.getRoot(getInstanceID())));
+      var zc = new ZooCache(getZooSession(), createPersistentWatcherPaths());
       zooCacheCreated.set(true);
       return zc;
     });
@@ -255,11 +250,9 @@ public ClientContext(SingletonReservation reservation, ClientInfo info,
         () -> SaslConnectionParams.from(getConfiguration(), getCredentials().getToken()), 100,
         MILLISECONDS);
     scanServerSelectorSupplier = memoize(this::createScanServerSelector);
-    this.singletonReservation = Objects.requireNonNull(reservation);
     this.tableops = new TableOperationsImpl(this);
     this.namespaceops = new NamespaceOperationsImpl(this, tableops);
-    this.serverPaths =
-        Suppliers.memoize(() -> new ServiceLockPaths(this.getZooKeeperRoot(), this.getZooCache()));
+    this.serverPaths = Suppliers.memoize(() -> new ServiceLockPaths(this.getZooCache()));
     if (ueh == Threads.UEH) {
       clientThreadPools = ThreadPools.getServerThreadPools();
     } else {
@@ -504,10 +497,6 @@ public InstanceId getInstanceID() {
     return info.getInstanceId();
   }
 
-  public String getZooKeeperRoot() {
-    return ZooUtil.getRoot(getInstanceID());
-  }
-
   /**
    * Returns the instance name given at system initialization time.
    *
@@ -813,7 +802,6 @@ public synchronized void close() {
       if (cleanupThreadPool != null) {
         cleanupThreadPool.shutdown(); // wait for shutdown tasks to execute
       }
-      singletonReservation.close();
     }
   }
 
@@ -846,16 +834,10 @@ public T build() {
     }
 
     public static AccumuloClient buildClient(ClientBuilderImpl<AccumuloClient> cbi) {
-      SingletonReservation reservation = SingletonManager.getClientReservation();
-      try {
-        // ClientContext closes reservation unless a RuntimeException is thrown
-        ClientInfo info = cbi.getClientInfo();
-        var config = ClientConfConverter.toAccumuloConf(info.getClientProperties());
-        return new ClientContext(reservation, info, config, cbi.getUncaughtExceptionHandler());
-      } catch (RuntimeException e) {
-        reservation.close();
-        throw e;
-      }
+      // ClientContext closes reservation unless a RuntimeException is thrown
+      ClientInfo info = cbi.getClientInfo();
+      var config = ClientConfConverter.toAccumuloConf(info.getClientProperties());
+      return new ClientContext(info, config, cbi.getUncaughtExceptionHandler());
     }
 
     public static Properties buildProps(ClientBuilderImpl<Properties> cbi) {
@@ -1090,10 +1072,9 @@ public synchronized ZookeeperLockChecker getTServerLockChecker() {
       // so, it can't rely on being able to continue to use the same client's ZooCache,
       // because that client could be closed, and its ZooSession also closed
       // this needs to be fixed; TODO https://github.com/apache/accumulo/issues/2301
-      var zk = info.getZooKeeperSupplier(ZookeeperLockChecker.class.getSimpleName(), "").get();
-      String zkRoot = getZooKeeperRoot();
-      this.zkLockChecker =
-          new ZookeeperLockChecker(new ZooCache(zk, Set.of(zkRoot + Constants.ZTSERVERS)), zkRoot);
+      var zk = info.getZooKeeperSupplier(ZookeeperLockChecker.class.getSimpleName(),
+          ZooUtil.getRoot(getInstanceID())).get();
+      this.zkLockChecker = new ZookeeperLockChecker(new ZooCache(zk, Set.of(Constants.ZTSERVERS)));
     }
     return this.zkLockChecker;
   }
@@ -1107,13 +1088,18 @@ public NamespaceMapping getNamespaces() {
     return namespaces;
   }
 
-  private static Set<String> createPersistentWatcherPaths(String zkRoot) {
+  public HashMap<TableId,ClientTabletCache> tabletCaches() {
+    ensureOpen();
+    return tabletCaches;
+  }
+
+  private static Set<String> createPersistentWatcherPaths() {
     Set<String> pathsToWatch = new HashSet<>();
     for (String path : Set.of(Constants.ZCOMPACTORS, Constants.ZDEADTSERVERS, Constants.ZGC_LOCK,
         Constants.ZMANAGER_LOCK, Constants.ZMINI_LOCK, Constants.ZMONITOR_LOCK,
         Constants.ZNAMESPACES, Constants.ZRECOVERY, Constants.ZSSERVERS, Constants.ZTABLES,
         Constants.ZTSERVERS, Constants.ZUSERS, RootTable.ZROOT_TABLET, Constants.ZTEST_LOCK)) {
-      pathsToWatch.add(zkRoot + path);
+      pathsToWatch.add(path);
     }
     return pathsToWatch;
   }

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

@@ -34,22 +34,17 @@
 import org.apache.accumulo.core.client.InvalidTabletHostingRequestException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.admin.TabletAvailability;
-import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.core.metadata.MetadataCachedTabletObtainer;
-import org.apache.accumulo.core.singletons.SingletonManager;
-import org.apache.accumulo.core.singletons.SingletonService;
 import org.apache.accumulo.core.util.Interner;
 import org.apache.accumulo.core.util.Timer;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.hadoop.io.Text;
 
-import com.google.common.base.Preconditions;
-
 /**
  * Client side cache of information about Tablets. Currently, a tablet prev end row is cached and
  * locations are cached if they exist.
@@ -189,66 +184,21 @@ public List<Range> binRanges(ClientContext context, List<Range> ranges,
    */
   public abstract void invalidateCache(ClientContext context, String server);
 
-  private static class InstanceKey {
-    final InstanceId instanceId;
-    final TableId tableId;
-
-    InstanceKey(InstanceId instanceId, TableId table) {
-      this.instanceId = instanceId;
-      this.tableId = table;
-    }
-
-    @Override
-    public int hashCode() {
-      return instanceId.hashCode() + tableId.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (o instanceof InstanceKey) {
-        return equals((InstanceKey) o);
-      }
-      return false;
-    }
-
-    public boolean equals(InstanceKey lk) {
-      return instanceId.equals(lk.instanceId) && tableId.equals(lk.tableId);
-    }
-
-  }
-
-  private static final HashMap<InstanceKey,ClientTabletCache> instances = new HashMap<>();
-  private static boolean enabled = true;
-
-  public static synchronized void clearInstances() {
+  public static synchronized void clearInstances(ClientContext context) {
+    final var instances = context.tabletCaches();
     for (ClientTabletCache locator : instances.values()) {
       locator.isValid = false;
     }
     instances.clear();
   }
 
-  static synchronized boolean isEnabled() {
-    return enabled;
-  }
-
-  static synchronized void disable() {
-    clearInstances();
-    enabled = false;
-  }
-
-  static synchronized void enable() {
-    enabled = true;
-  }
-
   public long getTabletHostingRequestCount() {
     return 0L;
   }
 
   public static synchronized ClientTabletCache getInstance(ClientContext context, TableId tableId) {
-    Preconditions.checkState(enabled, "The Accumulo singleton that that tracks tablet locations is "
-        + "disabled. This is likely caused by all AccumuloClients being closed or garbage collected");
-    InstanceKey key = new InstanceKey(context.getInstanceID(), tableId);
-    ClientTabletCache tl = instances.get(key);
+    final var caches = context.tabletCaches();
+    ClientTabletCache tl = caches.get(tableId);
     if (tl == null) {
       MetadataCachedTabletObtainer mlo = new MetadataCachedTabletObtainer();
 
@@ -263,32 +213,12 @@ public static synchronized ClientTabletCache getInstance(ClientContext context,
             getInstance(context, AccumuloTable.METADATA.tableId()), mlo,
             context.getTServerLockChecker());
       }
-      instances.put(key, tl);
+      caches.put(tableId, tl);
     }
 
     return tl;
   }
 
-  static {
-    SingletonManager.register(new SingletonService() {
-
-      @Override
-      public boolean isEnabled() {
-        return ClientTabletCache.isEnabled();
-      }
-
-      @Override
-      public void enable() {
-        ClientTabletCache.enable();
-      }
-
-      @Override
-      public void disable() {
-        ClientTabletCache.disable();
-      }
-    });
-  }
-
   public static class CachedTablets {
 
     private final List<CachedTablet> cachedTablets;

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

@@ -45,7 +45,6 @@
 
 import org.apache.accumulo.access.AccessEvaluator;
 import org.apache.accumulo.access.InvalidAccessExpressionException;
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.ConditionalWriter;
@@ -683,7 +682,7 @@ private void invalidateSession(SessionID sessionId, HostAndPort location)
 
     long startTime = System.currentTimeMillis();
 
-    LockID lid = new LockID(context.getZooKeeperRoot() + Constants.ZTSERVERS, sessionId.lockId);
+    LockID lid = LockID.deserialize(sessionId.lockId);
 
     while (true) {
       if (!ServiceLock.isLockHeld(context.getZooCache(), lid)) {

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

@@ -470,6 +470,12 @@ public InstanceId getInstanceId() {
     return context.getInstanceID();
   }
 
+  @Override
+  public Duration getManagerTime() throws AccumuloException, AccumuloSecurityException {
+    return Duration.ofNanos(ThriftClientTypes.MANAGER.execute(context,
+        client -> client.getManagerTimeNanos(TraceUtil.traceInfo(), context.rpcCreds())));
+  }
+
   @Override
   public ServerId getServer(ServerId.Type type, String resourceGroup, String host, int port) {
     Objects.requireNonNull(type, "type parameter cannot be null");

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

@@ -53,18 +53,17 @@ public NamespaceMapping(ClientContext context) {
     this.context = context;
   }
 
-  public static void put(final ZooReaderWriter zoo, final String zPath,
-      final NamespaceId namespaceId, final String namespaceName)
+  public static void put(final ZooReaderWriter zoo, final NamespaceId namespaceId,
+      final String namespaceName)
       throws InterruptedException, KeeperException, AcceptableThriftTableOperationException {
     requireNonNull(zoo);
-    requireNonNull(zPath);
     requireNonNull(namespaceId);
     requireNonNull(namespaceName);
     if (Namespace.DEFAULT.id().equals(namespaceId) || Namespace.ACCUMULO.id().equals(namespaceId)) {
       throw new AssertionError(
           "Putting built-in namespaces in map should not be possible after init");
     }
-    zoo.mutateExisting(zPath, data -> {
+    zoo.mutateExisting(Constants.ZNAMESPACES, data -> {
       var namespaces = deserialize(data);
       final String currentName = namespaces.get(namespaceId.canonical());
       if (namespaceName.equals(currentName)) {
@@ -106,18 +105,17 @@ public static void remove(final ZooReaderWriter zoo, final String zPath,
     });
   }
 
-  public static void rename(final ZooReaderWriter zoo, final String zPath,
-      final NamespaceId namespaceId, final String oldName, final String newName)
+  public static void rename(final ZooReaderWriter zoo, final NamespaceId namespaceId,
+      final String oldName, final String newName)
       throws InterruptedException, KeeperException, AcceptableThriftTableOperationException {
     requireNonNull(zoo);
-    requireNonNull(zPath);
     requireNonNull(namespaceId);
     requireNonNull(oldName);
     requireNonNull(newName);
     if (Namespace.DEFAULT.id().equals(namespaceId) || Namespace.ACCUMULO.id().equals(namespaceId)) {
       throw new AssertionError("Renaming built-in namespaces in map should not be possible");
     }
-    zoo.mutateExisting(zPath, current -> {
+    zoo.mutateExisting(Constants.ZNAMESPACES, current -> {
       var namespaces = deserialize(current);
       final String currentName = namespaces.get(namespaceId.canonical());
       if (newName.equals(currentName)) {
@@ -147,10 +145,9 @@ public static Map<String,String> deserialize(byte[] data) {
 
   private synchronized void update() {
     final ZooCache zc = context.getZooCache();
-    final String zPath = context.getZooKeeperRoot() + Constants.ZNAMESPACES;
     final ZcStat stat = new ZcStat();
 
-    byte[] data = zc.get(zPath, stat);
+    byte[] data = zc.get(Constants.ZNAMESPACES, stat);
     if (stat.getMzxid() > lastMzxid) {
       if (data == null) {
         throw new IllegalStateException("namespaces node should not be null");

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

@@ -128,10 +128,9 @@ protected CachedTablet getRootTabletLocation(ClientContext context) {
       timer = Timer.startNew();
     }
 
-    var zpath = RootTabletMetadata.zooPath(context);
     var zooCache = context.getZooCache();
-    Location loc = new RootTabletMetadata(new String(zooCache.get(zpath), UTF_8)).toTabletMetadata()
-        .getLocation();
+    Location loc = new RootTabletMetadata(new String(zooCache.get(RootTable.ZROOT_TABLET), UTF_8))
+        .toTabletMetadata().getLocation();
 
     if (timer != null) {
       log.trace("tid={} Found root tablet at {} in {}", Thread.currentThread().getId(), loc,