Merge branch 'main' into pretty-print-json-website

Author: ctubbsii

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

@@ -80,6 +80,7 @@
 import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
 import org.apache.accumulo.core.trace.TraceUtil;
 import org.apache.accumulo.core.util.ByteBufferUtil;
+import org.apache.accumulo.core.util.CountDownTimer;
 import org.apache.accumulo.core.util.Retry;
 import org.apache.accumulo.core.util.Timer;
 import org.apache.thrift.TApplicationException;
@@ -262,7 +263,7 @@ private ScanServerData binRanges(ClientTabletCache clientTabletCache, List<Range
 
     ScanServerData ssd;
 
-    Timer startTime = Timer.startNew();
+    CountDownTimer retryCountDownTimer = CountDownTimer.startNew(retryTimeout, MILLISECONDS);
 
     while (true) {
 
@@ -274,7 +275,7 @@ private ScanServerData binRanges(ClientTabletCache clientTabletCache, List<Range
         failures = clientTabletCache.binRanges(context, ranges, binnedRanges);
         ssd = new ScanServerData();
       } else if (options.getConsistencyLevel().equals(ConsistencyLevel.EVENTUAL)) {
-        ssd = binRangesForScanServers(clientTabletCache, ranges, binnedRanges, startTime);
+        ssd = binRangesForScanServers(clientTabletCache, ranges, binnedRanges, retryCountDownTimer);
         failures = ssd.failures;
       } else {
         throw new IllegalStateException();
@@ -299,7 +300,7 @@ private ScanServerData binRanges(ClientTabletCache clientTabletCache, List<Range
               failures.size(), tableId);
         }
 
-        if (startTime.elapsed(MILLISECONDS) > retryTimeout) {
+        if (retryCountDownTimer.isExpired()) {
           // TODO exception used for timeout is inconsistent
           throw new TimedOutException(
               "Failed to find servers to process scans before timeout was exceeded.");
@@ -650,10 +651,9 @@ public Duration getDelay() {
   }
 
   private ScanServerData binRangesForScanServers(ClientTabletCache clientTabletCache,
-      List<Range> ranges, Map<String,Map<KeyExtent,List<Range>>> binnedRanges, Timer startTime)
-      throws AccumuloException, TableNotFoundException, AccumuloSecurityException,
-      InvalidTabletHostingRequestException {
-
+      List<Range> ranges, Map<String,Map<KeyExtent,List<Range>>> binnedRanges,
+      CountDownTimer retryCountDownTimer) throws AccumuloException, TableNotFoundException,
+      AccumuloSecurityException, InvalidTabletHostingRequestException {
     ScanServerSelector ecsm = context.getScanServerSelector();
 
     Map<KeyExtent,String> extentToTserverMap = new HashMap<>();
@@ -697,7 +697,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));
+        Duration timeoutLeft = retryCountDownTimer.timeLeft();
         return ThriftScanner.waitUntil(condition, maxWaitTime, description, timeoutLeft, context,
             tableId, log);
       }
@@ -800,8 +800,8 @@ private static class TimeoutTracker {
     String server;
     Set<String> badServers;
     final long timeOut;
-    long activityTime;
-    Long firstErrorTime = null;
+    CountDownTimer timeoutCountDownTimer;
+    CountDownTimer errorTimer;
 
     TimeoutTracker(String server, Set<String> badServers, long timeOut) {
       this(timeOut);
@@ -811,29 +811,29 @@ private static class TimeoutTracker {
 
     TimeoutTracker(long timeOut) {
       this.timeOut = timeOut;
+      this.timeoutCountDownTimer = CountDownTimer.startNew(timeOut, MILLISECONDS);
     }
 
     void startingScan() {
-      activityTime = System.currentTimeMillis();
+      timeoutCountDownTimer.restart();
     }
 
     void check() throws IOException {
-      if (System.currentTimeMillis() - activityTime > timeOut) {
+      if (timeoutCountDownTimer.isExpired()) {
         badServers.add(server);
-        throw new IOException(
-            "Time exceeded " + (System.currentTimeMillis() - activityTime) + " " + server);
+        throw new IOException("Time exceeded " + timeOut + " ms for server " + server);
       }
     }
 
     void madeProgress() {
-      activityTime = System.currentTimeMillis();
-      firstErrorTime = null;
+      timeoutCountDownTimer.restart();
+      errorTimer = null;
     }
 
     void errorOccured() {
-      if (firstErrorTime == null) {
-        firstErrorTime = activityTime;
-      } else if (System.currentTimeMillis() - firstErrorTime > timeOut) {
+      if (errorTimer == null) {
+        errorTimer = CountDownTimer.startNew(timeOut, MILLISECONDS);
+      } else if (errorTimer.isExpired()) {
         badServers.add(server);
       }
     }

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

@@ -22,10 +22,10 @@
 
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
-import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeMissingPolicy;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.NoNodeException;
 import org.apache.zookeeper.KeeperException.NodeExistsException;
+import org.apache.zookeeper.data.Stat;
 import org.slf4j.LoggerFactory;
 
 public class ZooReservation {
@@ -59,9 +59,10 @@ public static boolean attempt(ZooReaderWriter zk, String path, FateId fateId, St
   public static void release(ZooReaderWriter zk, String path, FateId fateId)
       throws KeeperException, InterruptedException {
     byte[] zooData;
+    Stat stat = new Stat();
 
     try {
-      zooData = zk.getData(path);
+      zooData = zk.getData(path, stat);
     } catch (NoNodeException e) {
       // Just logging a warning, if data is gone then our work here is done.
       LoggerFactory.getLogger(ZooReservation.class).debug("Node does not exist {}", path);
@@ -76,7 +77,9 @@ public static void release(ZooReaderWriter zk, String path, FateId fateId)
           + " with data mismatch " + fateId + " " + zooDataStr);
     }
 
-    zk.recursiveDelete(path, NodeMissingPolicy.SKIP);
+    // Only delete the node if the version is the same. It should be the same as this holds the
+    // reservation, so for it to change at this point would probably indicate a bug.
+    zk.deleteStrict(path, stat.getVersion());
   }
 
 }

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

@@ -39,11 +39,11 @@
  * </pre>
  */
 public class CountDownTimer {
-  private final long startNanos;
+  private final Timer timer;
   private final long durationNanos;
 
   private CountDownTimer(long durationNanos) {
-    this.startNanos = System.nanoTime();
+    this.timer = Timer.startNew();
     this.durationNanos = durationNanos;
   }
 
@@ -68,12 +68,19 @@ public static CountDownTimer startNew(long duration, TimeUnit unit) {
     return new CountDownTimer(unit.toNanos(duration));
   }
 
+  /**
+   * Resets the timer to the initial duration.
+   */
+  public void restart() {
+    timer.restart();
+  }
+
   /**
    * @param unit the desired {@link TimeUnit} for the returned time.
    * @return the remaining time in the specified unit, or zero if expired.
    */
   public long timeLeft(TimeUnit unit) {
-    var elapsed = (System.nanoTime() - startNanos);
+    var elapsed = timer.elapsed(TimeUnit.NANOSECONDS);
     var timeLeft = durationNanos - elapsed;
     if (timeLeft < 0) {
       timeLeft = 0;
@@ -82,6 +89,13 @@ public long timeLeft(TimeUnit unit) {
     return unit.convert(timeLeft, TimeUnit.NANOSECONDS);
   }
 
+  /**
+   * @return the remaining time, or zero if expired.
+   */
+  public Duration timeLeft() {
+    return Duration.ofNanos(timeLeft(TimeUnit.NANOSECONDS));
+  }
+
   /**
    * Checks if the countdown timer has expired.
    *

pom.xml

@@ -134,6 +134,7 @@ under the License.
     <!-- used for filtering the java source with the current version -->
     <accumulo.build.release.version>${project.version}</accumulo.build.release.version>
     <accumulo.build.unitTestMemSize>-Xmx1G</accumulo.build.unitTestMemSize>
+    <accumulo.it.uniq.test.dir>false</accumulo.it.uniq.test.dir>
     <!-- avoid error shutting down built-in ForkJoinPool.commonPool() during exec:java tasks -->
     <exec.cleanupDaemonThreads>false</exec.cleanupDaemonThreads>
     <failsafe.excludedGroups />
@@ -169,12 +170,12 @@ under the License.
     <version.curator>5.8.0</version.curator>
     <version.errorprone>2.41.0</version.errorprone>
     <version.flatbuffers>24.3.25</version.flatbuffers>
-    <version.hadoop>3.4.0</version.hadoop>
+    <version.hadoop>3.4.2</version.hadoop>
     <version.log4j>2.25.1</version.log4j>
     <version.opentelemetry>1.48.0</version.opentelemetry>
     <version.slf4j>2.0.17</version.slf4j>
     <version.thrift>0.17.0</version.thrift>
-    <version.zookeeper>3.9.3</version.zookeeper>
+    <version.zookeeper>3.9.4</version.zookeeper>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -850,6 +851,7 @@ under the License.
             <excludedGroups>${failsafe.excludedGroups}</excludedGroups>
             <groups>${failsafe.groups}</groups>
             <systemPropertyVariables combine.children="append">
+              <accumulo.it.uniq.test.dir>${accumulo.it.uniq.test.dir}</accumulo.it.uniq.test.dir>
               <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
             </systemPropertyVariables>
             <argLine>${accumulo.build.extraTestArgs}</argLine>
@@ -1745,5 +1747,16 @@ under the License.
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>uniq-test-dirs</id>
+      <activation>
+        <property>
+          <name>uniq-test-dirs</name>
+        </property>
+      </activation>
+      <properties>
+        <accumulo.it.uniq.test.dir>true</accumulo.it.uniq.test.dir>
+      </properties>
+    </profile>
   </profiles>
 </project>

server/base/src/main/java/org/apache/accumulo/server/util/Admin.java

@@ -113,6 +113,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.JCommander;
+import com.beust.jcommander.MissingCommandException;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.auto.service.AutoService;
@@ -129,6 +130,9 @@ public class Admin implements KeywordExecutable {
   private static final Logger log = LoggerFactory.getLogger(Admin.class);
   private final CountDownLatch lockAcquiredLatch = new CountDownLatch(1);
 
+  @Deprecated(since = "4.0.0")
+  private static final String LOCKS_COMMAND = "locks";
+
   private static class SubCommandOpts {
     @Parameter(names = {"-h", "-?", "--help", "-help"}, help = true)
     public boolean help = false;
@@ -305,13 +309,6 @@ static class VerifyTabletAssignmentsCommand extends SubCommandOpts {
       commandDescription = "Changes the unique secret given to the instance that all servers must know.")
   static class ChangeSecretCommand {}
 
-  @Parameters(commandNames = "locks",
-      commandDescription = "List or delete Tablet Server locks. Default with no arguments is to list the locks.")
-  static class TabletServerLocksCommand extends SubCommandOpts {
-    @Parameter(names = "-delete", description = "specify a tablet server lock to delete")
-    String delete = null;
-  }
-
   @Parameters(commandNames = "deleteZooInstance",
       commandDescription = "Deletes specific instance name or id from zookeeper or cleans up all old instances.")
   static class DeleteZooInstanceCommand extends SubCommandOpts {
@@ -462,9 +459,6 @@ public void execute(final String[] args) {
     ListInstancesCommand listInstancesOpts = new ListInstancesCommand();
     cl.addCommand(listInstancesOpts);
 
-    TabletServerLocksCommand tServerLocksOpts = new TabletServerLocksCommand();
-    cl.addCommand(tServerLocksOpts);
-
     PingCommand pingCommand = new PingCommand();
     cl.addCommand(pingCommand);
 
@@ -487,7 +481,29 @@ public void execute(final String[] args) {
     VolumesCommand volumesCommand = new VolumesCommand();
     cl.addCommand(volumesCommand);
 
-    cl.parse(args);
+    try {
+      cl.parse(args);
+    } catch (MissingCommandException e) {
+      // Process removed commands to provide alternate approach
+      boolean foundRemovedCommand = false;
+      for (String arg : args) {
+        switch (arg) {
+          case LOCKS_COMMAND:
+            foundRemovedCommand = true;
+            System.out.println("'locks' command has been removed. Use 'serviceStatus' command"
+                + " to list processes and 'stop -f' command to remove their locks.");
+            break;
+          default:
+            break;
+        }
+      }
+      if (foundRemovedCommand) {
+        return;
+      } else {
+        cl.usage();
+        return;
+      }
+    }
 
     if (cl.getParsedCommand() == null) {
       cl.usage();
@@ -536,9 +552,6 @@ public void execute(final String[] args) {
             deleteZooInstOpts.auth);
       } else if (cl.getParsedCommand().equals("restoreZoo")) {
         RestoreZookeeper.execute(conf, restoreZooOpts.file, restoreZooOpts.overwrite);
-      } else if (cl.getParsedCommand().equals("locks")) {
-        TabletServerLocks.execute(context, args.length > 2 ? args[2] : null,
-            tServerLocksOpts.delete);
       } else if (cl.getParsedCommand().equals("fate")) {
         executeFateOpsCommand(context, fateOpsCommand);
       } else if (cl.getParsedCommand().equals("serviceStatus")) {