[accumulo] 01/01: Merge branch '1.9'

[ct...@apache.org]

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

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

commit d879f5849001dfcfcbe88fe69da0e77cf5a75470
Merge: 2196bc8 6b5b905
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Jul 15 23:13:08 2020 -0400

    Merge branch '1.9'
    
    (Merging #1646 into master branch to resolve #1644)

 .../main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
index 9657e5b,c7d040f..5ee84ab
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
@@@ -126,10 -135,10 +126,10 @@@ public class MinorCompactor extends Com
            return ret;
          } catch (IOException | UnsatisfiedLinkError e) {
            log.warn("MinC failed ({}) to create {} retrying ...", e.getMessage(), outputFileName);
 -          ProblemReports.getInstance(tabletServer).report(new ProblemReport(
 +          ProblemReports.getInstance(tabletServer.getContext()).report(new ProblemReport(
                getExtent().getTableId(), ProblemType.FILE_WRITE, outputFileName, e));
            reportedProblem = true;
-         } catch (RuntimeException e) {
+         } catch (RuntimeException | NoClassDefFoundError e) {
            // if this is coming from a user iterator, it is possible that the user could change the
            // iterator config and that the
            // minor compaction would succeed