You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/08/13 10:34:08 UTC
svn commit: r1372313 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Author: stack
Date: Mon Aug 13 08:34:07 2012
New Revision: 1372313
URL: http://svn.apache.org/viewvc?rev=1372313&view=rev
Log:
HBASE-6529 With HFile v2, the region server will always perform an extra copy of source files
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=1372313&r1=1372312&r2=1372313&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java Mon Aug 13 08:34:07 2012
@@ -53,6 +53,7 @@ import org.apache.hadoop.hbase.KeyValue.
import org.apache.hadoop.hbase.RemoteExceptionHandler;
import org.apache.hadoop.hbase.backup.HFileArchiver;
import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.fs.HFileSystem;
import org.apache.hadoop.hbase.io.HeapSize;
import org.apache.hadoop.hbase.io.hfile.CacheConfig;
import org.apache.hadoop.hbase.io.hfile.Compression;
@@ -564,7 +565,8 @@ public class Store extends SchemaConfigu
// Copy the file if it's on another filesystem
FileSystem srcFs = srcPath.getFileSystem(conf);
- if (!srcFs.equals(fs)) {
+ FileSystem desFs = fs instanceof HFileSystem ? ((HFileSystem)fs).getBackingFs() : fs;
+ if (!srcFs.equals(desFs)) {
LOG.info("Bulk-load file " + srcPath + " is on different filesystem than " +
"the destination store. Copying file over to destination filesystem.");
Path tmpPath = getTmpPath();