This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit eaf4c0af5b6da5d1236094197b27c9980f6f17a3 Merge: bddb2adb6d 01a8824789 Author: Daniel Roberts ddanielr <[email protected]> AuthorDate: Wed Dec 17 17:04:28 2025 +0000 Merge branch '2.1' .../base/src/main/java/org/apache/accumulo/server/fs/FileManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --cc server/base/src/main/java/org/apache/accumulo/server/fs/FileManager.java index 3f69b63b75,23ebfd1e23..10776cca2e --- a/server/base/src/main/java/org/apache/accumulo/server/fs/FileManager.java +++ b/server/base/src/main/java/org/apache/accumulo/server/fs/FileManager.java @@@ -52,8 -52,13 +52,9 @@@ import org.apache.accumulo.core.metadat import org.apache.accumulo.core.sample.impl.SamplerConfigurationImpl; import org.apache.accumulo.core.util.threads.ThreadPools; import org.apache.accumulo.server.ServerContext; + import org.apache.accumulo.server.conf.TableConfiguration; -import org.apache.accumulo.server.problems.ProblemReport; import org.apache.accumulo.server.problems.ProblemReportingIterator; -import org.apache.accumulo.server.problems.ProblemReports; -import org.apache.accumulo.server.problems.ProblemType; import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@@ -294,14 -298,19 +295,15 @@@ public class FileManager // limitations closeReaders(filesToClose); + TableConfiguration tableConf = context.getTableConfiguration(tablet.tableId()); + // open any files that need to be opened - for (String file : filesToOpen) { + for (StoredTabletFile file : filesToOpen) { try { - if (!file.contains(":")) { - throw new IllegalArgumentException("Expected uri, got : " + file); - } - Path path = new Path(file); - FileSystem ns = context.getVolumeManager().getFileSystemByPath(path); + FileSystem ns = context.getVolumeManager().getFileSystemByPath(file.getPath()); // log.debug("Opening "+file + " path " + path); - var tableConf = context.getTableConfiguration(tablet.tableId()); FileSKVIterator reader = FileOperations.getInstance().newReaderBuilder() - .forFile(path.toString(), ns, ns.getConf(), tableConf.getCryptoService()) + .forFile(file, ns, ns.getConf(), tableConf.getCryptoService()) .withTableConfiguration(tableConf).withCacheProvider(cacheProvider) .withFileLenCache(fileLenCache).build(); readersReserved.put(reader, file);
