You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2011/11/23 21:36:46 UTC
svn commit: r1205571 - in /incubator/accumulo/branches/1.4: ./
src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
Author: ecn
Date: Wed Nov 23 20:36:45 2011
New Revision: 1205571
URL: http://svn.apache.org/viewvc?rev=1205571&view=rev
Log:
ACCUMULO-168 consistently use org.apache.accumulo.core.file.FileUtil.getFileSystem() in FATE operations
Modified:
incubator/accumulo/branches/1.4/ (props changed)
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 23 20:36:45 2011
@@ -1 +1,3 @@
-/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547
+/incubator/accumulo/branches/1.4:1205476
+/incubator/accumulo/trunk:1205476,1205570
Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java?rev=1205571&r1=1205570&r2=1205571&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java Wed Nov 23 20:36:45 2011
@@ -371,7 +371,8 @@ class LoadFiles extends MasterRepo {
@Override
public Repo<Master> call(final long tid, Master master) throws Exception {
- FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
+ FileSystem fs = TraceFileSystem.wrap(org.apache.accumulo.core.file.FileUtil.getFileSystem(CachedConfiguration.getInstance(),
+ ServerConfiguration.getSiteConfiguration()));
List<FileStatus> files = new ArrayList<FileStatus>();
for (FileStatus entry : fs.listStatus(new Path(bulk))) {
files.add(entry);