commit 9f549b2fe19666138290913f5660f8bcc83e9f51
author Mike Miller <mmiller@apache.org> Tue Jan 12 14:50:10 2021 -0500
committer Mike Miller <mmiller@apache.org> Tue Jan 12 14:50:10 2021 -0500
tree 6afb7bd1d77f8000c8db8b427d40bd7ee159cfe3
parent 3e23ad8eb0e8309b71811ded490603343f070f79
parent 076f1b313da3151abfaf1a37eb6d11f42fdb7929

Merge remote-tracking branch 'upstream/1.10' into main

 Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java

server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java

diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
index a9c47b35..1a8ac2f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
@@ -88,7 +88,6 @@
       }
 
       try {
-        log.info("Copying {} to {}", src, dest);
         sort(sortId, new Path(src), dest);
       } finally {
         currentWork.remove(sortId);
@@ -107,7 +106,13 @@
       String formerThreadName = Thread.currentThread().getName();
       int part = 0;
       try {
+        // check for finished first since another thread may have already done the sort
+        if (fs.exists(SortedLogState.getFinishedMarkerPath(destPath))) {
+          log.debug("Sorting already finished at {}", destPath);
+          return;
+        }
 
+        log.info("Copying {} to {}", srcPath, destPath);
         // the following call does not throw an exception if the file/dir does not exist
         fs.deleteRecursively(new Path(destPath));