HBASE-10615 Make LoadIncrementalHFiles skip reference files (Jerry He)
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1574736 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
04ee3b2f25
commit
bd18c274ba
|
@ -67,6 +67,7 @@ import org.apache.hadoop.hbase.client.HTable;
|
|||
import org.apache.hadoop.hbase.client.RegionServerCallable;
|
||||
import org.apache.hadoop.hbase.client.RpcRetryingCallerFactory;
|
||||
import org.apache.hadoop.hbase.client.coprocessor.SecureBulkLoadClient;
|
||||
import org.apache.hadoop.hbase.io.HFileLink;
|
||||
import org.apache.hadoop.hbase.io.HalfStoreFileReader;
|
||||
import org.apache.hadoop.hbase.io.Reference;
|
||||
import org.apache.hadoop.hbase.io.compress.Compression.Algorithm;
|
||||
|
@ -79,6 +80,7 @@ import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
|
|||
import org.apache.hadoop.hbase.regionserver.BloomType;
|
||||
import org.apache.hadoop.hbase.regionserver.HStore;
|
||||
import org.apache.hadoop.hbase.regionserver.StoreFile;
|
||||
import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
|
||||
import org.apache.hadoop.hbase.security.UserProvider;
|
||||
import org.apache.hadoop.hbase.security.token.FsDelegationToken;
|
||||
import org.apache.hadoop.hbase.util.Bytes;
|
||||
|
@ -184,7 +186,17 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
|
|||
byte[] family = familyDir.getName().getBytes();
|
||||
Path[] hfiles = FileUtil.stat2Paths(fs.listStatus(familyDir));
|
||||
for (Path hfile : hfiles) {
|
||||
if (hfile.getName().startsWith("_")) continue;
|
||||
// Skip "_", reference, HFileLink
|
||||
String fileName = hfile.getName();
|
||||
if (fileName.startsWith("_")) continue;
|
||||
if (StoreFileInfo.isReference(fileName)) {
|
||||
LOG.warn("Skipping reference " + fileName);
|
||||
continue;
|
||||
}
|
||||
if (HFileLink.isHFileLink(fileName)) {
|
||||
LOG.warn("Skipping HFileLink " + fileName);
|
||||
continue;
|
||||
}
|
||||
ret.add(new LoadQueueItem(family, hfile));
|
||||
}
|
||||
}
|
||||
|
@ -791,7 +803,9 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
|
|||
|
||||
Path[] hfiles = FileUtil.stat2Paths(fs.listStatus(familyDir));
|
||||
for (Path hfile : hfiles) {
|
||||
if (hfile.getName().startsWith("_")) continue;
|
||||
String fileName = hfile.getName();
|
||||
if (fileName.startsWith("_") || StoreFileInfo.isReference(fileName)
|
||||
|| HFileLink.isHFileLink(fileName)) continue;
|
||||
HFile.Reader reader = HFile.createReader(fs, hfile,
|
||||
new CacheConfig(getConf()), getConf());
|
||||
final byte[] first, last;
|
||||
|
|
Loading…
Reference in New Issue