ACCUMULO-2061 Get all of the unit tests running successfully
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e97b093b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e97b093b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e97b093b Branch: refs/heads/ACCUMULO-2061 Commit: e97b093b320eb5025d619e7fa1494b4c150599b8 Parents: e613f71 Author: Josh Elser <els...@apache.org> Authored: Sat Mar 8 00:34:53 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sat Mar 8 00:34:53 2014 -0500 ---------------------------------------------------------------------- .../core/volume/VolumeConfiguration.java | 3 ++- .../accumulo/server/fs/VolumeManagerImpl.java | 4 +-- .../accumulo/master/tableOps/ExportTable.java | 2 +- .../accumulo/master/tableOps/ImportTable.java | 2 +- .../monitor/servlets/DefaultServlet.java | 2 +- .../tserver/BulkFailedCopyProcessor.java | 27 ++++++++++---------- .../org/apache/accumulo/tserver/Compactor.java | 4 +-- .../apache/accumulo/tserver/FileManager.java | 2 +- .../org/apache/accumulo/tserver/Tablet.java | 4 +-- .../apache/accumulo/tserver/TabletServer.java | 2 +- .../compaction/MajorCompactionRequest.java | 2 +- .../apache/accumulo/tserver/log/LogSorter.java | 2 +- .../accumulo/tserver/log/MultiReader.java | 2 +- .../apache/accumulo/tserver/RootFilesTest.java | 1 + .../tserver/TabletServerSyncCheckTest.java | 12 +++++---- .../accumulo/tserver/log/MultiReaderTest.java | 8 +++--- .../tserver/log/SortedLogRecoveryTest.java | 9 ++++--- .../tserver/log/TestUpgradePathForWALogs.java | 6 ++--- .../performance/scan/CollectTabletStats.java | 6 ++--- .../accumulo/test/functional/BulkFileIT.java | 2 +- 20 files changed, 54 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java index 460ffbe..3f4ab3e 100644 --- a/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java @@ -128,7 +128,8 @@ public class VolumeConfiguration { */ @SuppressWarnings("deprecation") public static <T extends FileSystem> Volume create(T fs, AccumuloConfiguration acuconf) { - return new VolumeImpl(fs, acuconf.get(Property.INSTANCE_DFS_DIR)); + String dfsDir = acuconf.get(Property.INSTANCE_DFS_DIR); + return new VolumeImpl(fs, null == dfsDir ? Property.INSTANCE_DFS_DIR.getDefaultValue() : dfsDir); } public static <T extends FileSystem> Volume create(T fs, String basePath) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java index e19182d..a32b0bd 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java @@ -87,9 +87,9 @@ public class VolumeManagerImpl implements VolumeManager { } } - public static org.apache.accumulo.server.fs.VolumeManager getLocal() throws IOException { + public static org.apache.accumulo.server.fs.VolumeManager getLocal(String localBasePath) throws IOException { AccumuloConfiguration accConf = DefaultConfiguration.getDefaultConfiguration(); - Volume defaultLocalVolume = VolumeConfiguration.create(FileSystem.getLocal(CachedConfiguration.getInstance()), accConf); + Volume defaultLocalVolume = VolumeConfiguration.create(FileSystem.getLocal(CachedConfiguration.getInstance()), localBasePath); return new VolumeManagerImpl(Collections.singletonMap("", defaultLocalVolume), "", accConf); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportTable.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportTable.java index 36bbb53..eeb9b16 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportTable.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportTable.java @@ -152,7 +152,7 @@ class WriteExportFiles extends MasterRepo { public static void exportTable(VolumeManager fs, Connector conn, String tableName, String tableID, String exportDir) throws Exception { fs.mkdirs(new Path(exportDir)); - Path exportMetaFilePath = fs.getFileSystemByPath(new Path(exportDir)).makeQualified(new Path(exportDir, Constants.EXPORT_FILE)); + Path exportMetaFilePath = fs.getVolumeByPath(new Path(exportDir)).getFileSystem().makeQualified(new Path(exportDir, Constants.EXPORT_FILE)); FSDataOutputStream fileOut = fs.create(exportMetaFilePath, false); ZipOutputStream zipOut = new ZipOutputStream(fileOut); http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java index 7e84c55..cd59b78 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java @@ -427,7 +427,7 @@ class ImportPopulateZookeeper extends MasterRepo { Path path = new Path(tableInfo.exportDir, Constants.EXPORT_FILE); try { - FileSystem ns = fs.getFileSystemByPath(path); + FileSystem ns = fs.getVolumeByPath(path).getFileSystem(); return TableOperationsImpl.getExportedProps(ns, path); } catch (IOException ioe) { throw new ThriftTableOperationException(tableInfo.tableId, tableInfo.tableName, TableOperation.IMPORT, TableOperationExceptionType.OTHER, http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java index 0da06cb..31e63ed 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java @@ -270,7 +270,7 @@ public class DefaultServlet extends BasicServlet { try { for (String baseDir : VolumeConfiguration.getVolumeUris(ServerConfiguration.getSiteConfiguration())) { final Path basePath = new Path(baseDir); - final FileSystem fs = vm.getFileSystemByPath(basePath); + final FileSystem fs = vm.getVolumeByPath(basePath).getFileSystem(); try { // Calculate the amount of space used by Accumulo on the FileSystem http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java index 5c64970..6b31af1 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java @@ -20,6 +20,7 @@ import java.io.IOException; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.util.CachedConfiguration; +import org.apache.accumulo.core.volume.VolumeConfiguration; import org.apache.accumulo.server.conf.ServerConfiguration; import org.apache.accumulo.server.trace.TraceFileSystem; import org.apache.accumulo.server.zookeeper.DistributedWorkQueue.Processor; @@ -32,35 +33,35 @@ import org.apache.log4j.Logger; * Copy failed bulk imports. */ public class BulkFailedCopyProcessor implements Processor { - + private static final Logger log = Logger.getLogger(BulkFailedCopyProcessor.class); - + @Override public Processor newProcessor() { return new BulkFailedCopyProcessor(); } - + @Override public void process(String workID, byte[] data) { - + String paths[] = new String(data, Constants.UTF8).split(","); - + Path orig = new Path(paths[0]); Path dest = new Path(paths[1]); Path tmp = new Path(dest.getParent(), dest.getName() + ".tmp"); - + try { - FileSystem fs = TraceFileSystem.wrap(org.apache.accumulo.core.volume.VolumeConfiguration.getDefaultFilesystem(CachedConfiguration.getInstance(), - ServerConfiguration.getSiteConfiguration())); - + FileSystem fs = TraceFileSystem.wrap(VolumeConfiguration.getDefaultVolume(CachedConfiguration.getInstance(), + ServerConfiguration.getSiteConfiguration()).getFileSystem()); + FileUtil.copy(fs, orig, fs, tmp, false, true, CachedConfiguration.getInstance()); fs.rename(tmp, dest); log.debug("copied " + orig + " to " + dest); } catch (IOException ex) { try { - FileSystem fs = TraceFileSystem.wrap(org.apache.accumulo.core.volume.VolumeConfiguration.getDefaultFilesystem(CachedConfiguration.getInstance(), - ServerConfiguration.getSiteConfiguration())); - + FileSystem fs = TraceFileSystem.wrap(VolumeConfiguration.getDefaultVolume(CachedConfiguration.getInstance(), + ServerConfiguration.getSiteConfiguration()).getFileSystem()); + fs.create(dest).close(); log.warn(" marked " + dest + " failed", ex); } catch (IOException e) { @@ -69,5 +70,5 @@ public class BulkFailedCopyProcessor implements Processor { } } - + } http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/tserver/src/main/java/org/apache/accumulo/tserver/Compactor.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/Compactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/Compactor.java index 151db6e..822171c 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Compactor.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Compactor.java @@ -336,7 +336,7 @@ public class Compactor implements Callable<CompactionStats> { thread = Thread.currentThread(); try { FileOperations fileFactory = FileOperations.getInstance(); - FileSystem ns = this.fs.getFileSystemByPath(outputFile.path()); + FileSystem ns = this.fs.getVolumeByPath(outputFile.path()).getFileSystem(); mfw = fileFactory.openWriter(outputFile.path().toString(), ns, ns.getConf(), acuTableConf); Map<String,Set<ByteSequence>> lGroups; @@ -421,7 +421,7 @@ public class Compactor implements Callable<CompactionStats> { try { FileOperations fileFactory = FileOperations.getInstance(); - FileSystem fs = this.fs.getFileSystemByPath(mapFile.path()); + FileSystem fs = this.fs.getVolumeByPath(mapFile.path()).getFileSystem(); FileSKVIterator reader; reader = fileFactory.openReader(mapFile.path().toString(), false, fs, conf, acuTableConf); http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java index bb95532..8bf2517 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java @@ -309,7 +309,7 @@ public class FileManager { if (!file.contains(":")) throw new IllegalArgumentException("Expected uri, got : " + file); Path path = new Path(file); - FileSystem ns = fs.getFileSystemByPath(path); + FileSystem ns = fs.getVolumeByPath(path).getFileSystem(); //log.debug("Opening "+file + " path " + path); FileSKVIterator reader = FileOperations.getInstance().openReader(path.toString(), false, ns, ns.getConf(), conf.getTableConfiguration(table.toString()), dataCache, indexCache); http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java index cc4b68d..3fe60b7 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java @@ -1260,7 +1260,7 @@ public class Tablet { long rtime = Long.MIN_VALUE; for (FileRef ref : datafiles.keySet()) { Path path = ref.path(); - FileSystem ns = fs.getFileSystemByPath(path); + FileSystem ns = fs.getVolumeByPath(path).getFileSystem(); FileSKVIterator reader = FileOperations.getInstance().openReader(path.toString(), true, ns, ns.getConf(), tabletServer.getTableConfiguration(extent)); long maxTime = -1; try { @@ -2975,7 +2975,7 @@ public class Tablet { FileOperations fileFactory = FileOperations.getInstance(); for (Entry<FileRef,DataFileValue> entry : allFiles.entrySet()) { FileRef file = entry.getKey(); - FileSystem ns = fs.getFileSystemByPath(file.path()); + FileSystem ns = fs.getVolumeByPath(file.path()).getFileSystem(); FileSKVIterator openReader = fileFactory.openReader(file.path().toString(), true, ns, ns.getConf(), this.getTableConfiguration()); try { Key first = openReader.getFirstKey(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index 475621b..6d73125 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -969,7 +969,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu Map<FileRef,MapFileInfo> fileRefMap = new HashMap<FileRef,MapFileInfo>(); for (Entry<String,MapFileInfo> mapping : fileMap.entrySet()) { Path path = new Path(mapping.getKey()); - FileSystem ns = fs.getFileSystemByPath(path); + FileSystem ns = fs.getVolumeByPath(path).getFileSystem(); path = ns.makeQualified(path); fileRefMap.put(new FileRef(path.toString(), path), mapping.getValue()); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java index 3bbb476..900600f 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java @@ -81,7 +81,7 @@ public class MajorCompactionRequest implements Cloneable { // @TODO verify the file isn't some random file in HDFS // @TODO ensure these files are always closed? FileOperations fileFactory = FileOperations.getInstance(); - FileSystem ns = volumeManager.getFileSystemByPath(ref.path()); + FileSystem ns = volumeManager.getVolumeByPath(ref.path()).getFileSystem(); FileSKVIterator openReader = fileFactory.openReader(ref.path().toString(), true, ns, ns.getConf(), tableConfig); return openReader; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/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 8f783c3..bb8e3c7 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 @@ -160,7 +160,7 @@ public class LogSorter { private void writeBuffer(String destPath, ArrayList<Pair<LogFileKey,LogFileValue>> buffer, int part) throws IOException { Path path = new Path(destPath, String.format("part-r-%05d", part++)); - FileSystem ns = fs.getFileSystemByPath(path); + FileSystem ns = fs.getVolumeByPath(path).getFileSystem(); @SuppressWarnings("deprecation") MapFile.Writer output = new MapFile.Writer(ns.getConf(), ns, path.toString(), LogFileKey.class, LogFileValue.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/MultiReader.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/MultiReader.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/MultiReader.java index a28bac4..541f075 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/MultiReader.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/MultiReader.java @@ -97,7 +97,7 @@ public class MultiReader { foundFinish = true; continue; } - FileSystem ns = fs.getFileSystemByPath(child.getPath()); + FileSystem ns = fs.getVolumeByPath(child.getPath()).getFileSystem(); heap.add(new Index(new Reader(ns, child.getPath().toString(), ns.getConf()))); } if (!foundFinish) http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/tserver/src/test/java/org/apache/accumulo/tserver/RootFilesTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/RootFilesTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/RootFilesTest.java index 1cd8f12..7a1c84b 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/RootFilesTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/RootFilesTest.java @@ -116,6 +116,7 @@ public class RootFilesTest { ConfigurationCopy conf = new ConfigurationCopy(); conf.set(Property.INSTANCE_DFS_URI, "file:///"); + conf.set(Property.INSTANCE_DFS_DIR, "/"); VolumeManager vm = VolumeManagerImpl.get(conf); http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java index 50c8b31..a5a1deb 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java @@ -22,6 +22,8 @@ import java.util.Map; import org.apache.accumulo.core.conf.ConfigurationCopy; import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.volume.Volume; +import org.apache.accumulo.core.volume.VolumeImpl; import org.apache.accumulo.server.fs.VolumeManagerImpl; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.ContentSummary; @@ -44,7 +46,7 @@ public class TabletServerSyncCheckTest { conf.set(DFS_DURABLE_SYNC, "false"); FileSystem fs = new TestFileSystem(conf); - TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.of("foo", fs)); + TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.<String,Volume> of("foo", new VolumeImpl(fs, "/"))); vm.ensureSyncIsEnabled(); } @@ -56,7 +58,7 @@ public class TabletServerSyncCheckTest { FileSystem fs1 = new TestFileSystem(conf1); FileSystem fs2 = new TestFileSystem(conf2); - TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.of("bar", fs2, "foo", fs1)); + TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.<String,Volume> of("bar", new VolumeImpl(fs2, "/"), "foo", new VolumeImpl(fs1, "/"))); vm.ensureSyncIsEnabled(); } @@ -67,7 +69,7 @@ public class TabletServerSyncCheckTest { conf.set(DFS_SUPPORT_APPEND, "false"); FileSystem fs = new TestFileSystem(conf); - TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.of("foo", fs)); + TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.<String,Volume> of("foo", new VolumeImpl(fs, "/"))); vm.ensureSyncIsEnabled(); } @@ -89,7 +91,7 @@ public class TabletServerSyncCheckTest { private class TestVolumeManagerImpl extends VolumeManagerImpl { - public TestVolumeManagerImpl(Map<String,? extends FileSystem> volumes) { + public TestVolumeManagerImpl(Map<String,Volume> volumes) { super(volumes, volumes.keySet().iterator().next(), new ConfigurationCopy(Collections.<String,String> emptyMap())); } @@ -149,7 +151,7 @@ public class TabletServerSyncCheckTest { } @Override - public FileSystem getFileSystemByPath(Path path) { + public Volume getVolumeByPath(Path path) { return null; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java index c4d3dfb..a79e77e 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java @@ -42,13 +42,13 @@ public class MultiReaderTest { @Before public void setUp() throws Exception { - fs = VolumeManagerImpl.getLocal(); root.create(); - String path = root.getRoot().getAbsolutePath(); - Path root = new Path("file://" + path + "/manyMaps"); + String path = root.getRoot().getAbsolutePath() + "/manyMaps"; + fs = VolumeManagerImpl.getLocal(path); + Path root = new Path("file://" + path); fs.mkdirs(root); fs.create(new Path(root, "finished")).close(); - FileSystem ns = fs.getFileSystemByPath(root); + FileSystem ns = fs.getVolumeByPath(root).getFileSystem(); @SuppressWarnings("deprecation") Writer oddWriter = new Writer(ns.getConf(), ns, new Path(root, "odd").toString(), IntWritable.class, BytesWritable.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java index 359bfa1..fffa15e 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java @@ -117,14 +117,15 @@ public class SortedLogRecoveryTest { private static List<Mutation> recover(Map<String,KeyValue[]> logs, Set<String> files, KeyExtent extent) throws IOException { TemporaryFolder root = new TemporaryFolder(new File(System.getProperty("user.dir") + "/target")); root.create(); - final String workdir = "file://" + root.getRoot().getAbsolutePath() + "/workdir"; - VolumeManager fs = VolumeManagerImpl.getLocal(); - fs.deleteRecursively(new Path(workdir)); + final String workdir = root.getRoot().getAbsolutePath() + "/workdir"; + VolumeManager fs = VolumeManagerImpl.getLocal(workdir); + final Path workdirPath = new Path("file://" + workdir); + fs.deleteRecursively(workdirPath); ArrayList<Path> dirs = new ArrayList<Path>(); try { for (Entry<String,KeyValue[]> entry : logs.entrySet()) { String path = workdir + "/" + entry.getKey(); - FileSystem ns = fs.getFileSystemByPath(new Path(path)); + FileSystem ns = fs.getVolumeByPath(new Path(path)).getFileSystem(); @SuppressWarnings("deprecation") Writer map = new MapFile.Writer(ns.getConf(), ns, path + "/log1", LogFileKey.class, LogFileValue.class); for (KeyValue lfe : entry.getValue()) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/TestUpgradePathForWALogs.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/TestUpgradePathForWALogs.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/TestUpgradePathForWALogs.java index af149fa..d6c23e3 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/TestUpgradePathForWALogs.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/TestUpgradePathForWALogs.java @@ -61,10 +61,10 @@ public class TestUpgradePathForWALogs { public void setUp() throws Exception { // quiet log messages about compress.CodecPool Logger.getRootLogger().setLevel(Level.ERROR); - fs = VolumeManagerImpl.getLocal(); root.create(); - String path = root.getRoot().getAbsolutePath(); - Path manyMapsPath = new Path("file://" + path + "/manyMaps"); + String path = root.getRoot().getAbsolutePath() + "/manyMaps"; + fs = VolumeManagerImpl.getLocal(path); + Path manyMapsPath = new Path("file://" + path); fs.mkdirs(manyMapsPath); fs.create(new Path(manyMapsPath, "finished")).close(); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java index 9a9cad7..d2c8d0f 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java @@ -398,7 +398,7 @@ public class CollectTabletStats { // assume it is a map file status = fs.getFileStatus(new Path(file + "/data")); } - FileSystem ns = fs.getFileSystemByPath(file.path()); + FileSystem ns = fs.getVolumeByPath(file.path()).getFileSystem(); BlockLocation[] locs = ns.getFileBlockLocations(status, 0, status.getLen()); System.out.println("\t\t\tBlocks for : " + file); @@ -445,7 +445,7 @@ public class CollectTabletStats { HashSet<ByteSequence> columnSet = createColumnBSS(columns); for (FileRef file : files) { - FileSystem ns = fs.getFileSystemByPath(file.path()); + FileSystem ns = fs.getVolumeByPath(file.path()).getFileSystem(); FileSKVIterator reader = FileOperations.getInstance().openReader(file.path().toString(), false, ns, ns.getConf(), aconf); Range range = new Range(ke.getPrevEndRow(), false, ke.getEndRow(), true); reader.seek(range, columnSet, columnSet.size() == 0 ? false : true); @@ -475,7 +475,7 @@ public class CollectTabletStats { List<SortedKeyValueIterator<Key,Value>> readers = new ArrayList<SortedKeyValueIterator<Key,Value>>(files.size()); for (FileRef file : files) { - FileSystem ns = fs.getFileSystemByPath(file.path()); + FileSystem ns = fs.getVolumeByPath(file.path()).getFileSystem(); readers.add(FileOperations.getInstance().openReader(file.path().toString(), false, ns, ns.getConf(), aconf.getConfiguration())); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97b093b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java index 5df7b68..eee093b 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java @@ -53,7 +53,7 @@ public class BulkFileIT extends SimpleMacIT { c.tableOperations().addSplits(tableName, splits); Configuration conf = new Configuration(); AccumuloConfiguration aconf = ServerConfiguration.getDefaultConfiguration(); - FileSystem fs = TraceFileSystem.wrap(VolumeConfiguration.getDefaultFilesystem(conf, aconf)); + FileSystem fs = TraceFileSystem.wrap(VolumeConfiguration.getDefaultVolume(conf, aconf).getFileSystem()); String dir = rootPath() + "/bulk_test_diff_files_89723987592_" + getTableNames(1)[0];
