[accumulo] branch main updated (3e23ad8 -> 9f549b2)

[mm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


    from 3e23ad8  Fixes #1665 use old compaction thread pool config if set (#1861)
     add 076f1b3  Add check for finished to LogSorter (#1863)
     new 9f549b2  Merge remote-tracking branch 'upstream/1.10' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/org/apache/accumulo/tserver/log/LogSorter.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

[accumulo] 01/01: Merge remote-tracking branch 'upstream/1.10' into main

[mm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 9f549b2fe19666138290913f5660f8bcc83e9f51
Merge: 3e23ad8 076f1b3
Author: Mike Miller <mm...@apache.org>
AuthorDate: Tue Jan 12 14:50:10 2021 -0500

    Merge remote-tracking branch 'upstream/1.10' into main
    
     Conflicts:
    	server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java

 .../src/main/java/org/apache/accumulo/tserver/log/LogSorter.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
index a9c47b35,4d43da0..1a8ac2f
--- 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
@@@ -107,7 -109,13 +106,13 @@@ public class LogSorter 
        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 " + srcPath + " to " + destPath);
++        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));