[accumulo] branch main updated: Fix crypto in Upgrader9to10 (#2959)

[mmiller]

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


The following commit(s) were added to refs/heads/main by this push:
     new 31046704d3 Fix crypto in Upgrader9to10 (#2959)
31046704d3 is described below

commit 31046704d39b1cad3f682505bed09da000a2906d
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Sep 26 13:36:15 2022 +0000

    Fix crypto in Upgrader9to10 (#2959)
    
    * Closes #2960
---
 .../main/java/org/apache/accumulo/manager/upgrade/Upgrader9to10.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader9to10.java
 
b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader9to10.java
index 96315e08ba..fc99d90037 100644
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader9to10.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader9to10.java
@@ -69,6 +69,7 @@ import 
org.apache.accumulo.core.metadata.schema.RootTabletMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata.LocationType;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.spi.compaction.SimpleCompactionDispatcher;
+import org.apache.accumulo.core.spi.crypto.NoCryptoServiceFactory;
 import org.apache.accumulo.core.tabletserver.log.LogEntry;
 import org.apache.accumulo.core.util.HostAndPort;
 import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
@@ -430,7 +431,7 @@ public class Upgrader9to10 implements Upgrader {
         var tableConf = context.getTableConfiguration(RootTable.ID);
         long maxTime = -1;
         try (FileSKVIterator reader = 
FileOperations.getInstance().newReaderBuilder()
-            .forFile(path.toString(), ns, ns.getConf(), 
tableConf.getCryptoService())
+            .forFile(path.toString(), ns, ns.getConf(), 
NoCryptoServiceFactory.NONE)
             .withTableConfiguration(tableConf).seekToBeginning().build()) {
           while (reader.hasTop()) {
             maxTime = Math.max(maxTime, reader.getTopKey().getTimestamp());