Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HBASE-27688 HFile splitting occurs during bulkload, the CREATE_TIME_TS of hfileinfo is 0 #5082

Merged
merged 12 commits into from
Mar 10, 2023
Merged

HBASE-27688 HFile splitting occurs during bulkload, the CREATE_TIME_TS of hfileinfo is 0 #5082

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d9f38fa
JIRAID:HBASE-27670
Feb 27, 2023
d82743a
JIRAID:HBASE-27670
Feb 28, 2023
c5c0a24
JIRAID:HBASE-27670
Feb 28, 2023
61e6d91
JIRAID:HBASE-27670
Mar 1, 2023
87fbf18
JIRAID:HBASE-27670
Mar 3, 2023
0c27d84
JIRAID:HBASE-27670
Mar 4, 2023
1c4eecd
Merge branch 'apache:master' into HBASE-27670
haohao0103 Mar 6, 2023
f99b0b2
JIRAID:HBASE-27688
Mar 6, 2023
3e3deb5
JIRAID:HBASE-27688
Mar 6, 2023
a5300f1
JIRAID:HBASE-27688
Mar 6, 2023
7c477e8
JIRAID:HBASE-27688
Mar 6, 2023
b6d8186
JIRAID:HBASE-27688
Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion hbase-server/src/main/java/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
import org.apache.hadoop.hbase.security.UserProvider;
import org.apache.hadoop.hbase.security.token.FsDelegationToken;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.FSVisitor;
import org.apache.hadoop.hbase.util.FutureUtils;
import org.apache.hadoop.hbase.util.Pair;
Expand Down Expand Up @@ -767,7 +768,7 @@ private static void copyHFileHalf(Configuration conf, Path inFile, Path outFile,
.withChecksumType(StoreUtils.getChecksumType(conf))
.withBytesPerCheckSum(StoreUtils.getBytesPerChecksum(conf)).withBlockSize(blocksize)
.withDataBlockEncoding(familyDescriptor.getDataBlockEncoding()).withIncludesTags(true)
.build();
.withCreateTime(EnvironmentEdgeManager.currentTime()).build();
halfWriter = new StoreFileWriter.Builder(conf, cacheConf, fs).withFilePath(outFile)
.withBloomType(bloomFilterType).withFileContext(hFileContext).build();
HFileScanner scanner = halfReader.getScanner(false, false, false);
Expand Down
31 changes: 31 additions & 0 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestBulkLoadHFiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.io.hfile.CacheConfig;
import org.apache.hadoop.hbase.io.hfile.HFile;
import org.apache.hadoop.hbase.io.hfile.HFileInfo;
import org.apache.hadoop.hbase.io.hfile.HFileScanner;
import org.apache.hadoop.hbase.regionserver.BloomType;
import org.apache.hadoop.hbase.testclassification.LargeTests;
Expand Down Expand Up @@ -567,6 +568,25 @@ public void testSplitStoreFile() throws IOException {
assertEquals(1000, rowCount);
}

@Test
public void testSplitStoreFileWithCreateTimeTS() throws IOException {
Path dir = util.getDataTestDirOnTestFS("testSplitStoreFileWithCreateTimeTS");
FileSystem fs = util.getTestFileSystem();
Path testIn = new Path(dir, "testhfile");
ColumnFamilyDescriptor familyDesc = ColumnFamilyDescriptorBuilder.of(FAMILY);
HFileTestUtil.createHFile(util.getConfiguration(), fs, testIn, FAMILY, QUALIFIER,
Bytes.toBytes("aaa"), Bytes.toBytes("zzz"), 1000);

Path bottomOut = new Path(dir, "bottom.out");
Path topOut = new Path(dir, "top.out");

BulkLoadHFilesTool.splitStoreFile(util.getConfiguration(), testIn, familyDesc,
Bytes.toBytes("ggg"), bottomOut, topOut);

verifyHFileCreateTimeTS(bottomOut);
verifyHFileCreateTimeTS(topOut);
}

@Test
public void testSplitStoreFileWithNoneToNone() throws IOException {
testSplitStoreFileWithDifferentEncoding(DataBlockEncoding.NONE, DataBlockEncoding.NONE);
Expand Down Expand Up @@ -623,6 +643,17 @@ private int verifyHFile(Path p) throws IOException {
return count;
}

private void verifyHFileCreateTimeTS(Path p) throws IOException {
Configuration conf = util.getConfiguration();
HFile.Reader reader =
haohao0103 marked this conversation as resolved.
Show resolved Hide resolved
HFile.createReader(p.getFileSystem(conf), p, new CacheConfig(conf), true, conf);
final HFileInfo hFileInfo = reader.getHFileInfo();
final long fileCreateTime = hFileInfo.getHFileContext().getFileCreateTime();
reader.close();
assertTrue(fileCreateTime != 0);
haohao0103 marked this conversation as resolved.
Show resolved Hide resolved

}

private void addStartEndKeysForTest(TreeMap<byte[], Integer> map, byte[] first, byte[] last) {
Integer value = map.containsKey(first) ? map.get(first) : 0;
map.put(first, value + 1);
Expand Down