Skip to content

HBASE-30330 NPE on CustomDateTieredCompactionPolicy.shouldPerformMajorCompaction #8548

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

Open
wchevreuil wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −0
Open

HBASE-30330 NPE on CustomDateTieredCompactionPolicy.shouldPerformMajorCompaction #8548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions ...va/org/apache/hadoop/hbase/regionserver/compactions/CustomDateTieredCompactionPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,12 @@ public boolean shouldPerformMajorCompaction(Collection<HStoreFile> filesToCompac
return true;
}
byte[] timeRangeBytes = f.getMetadataValue(CUSTOM_TIERING_TIME_RANGE);
// this means this file has not been major compacted by manually triggered compaction at
// the time of enabling Custom Time Based Priority, so it needs compaction to have its rows
// separated according to the cutOffTimestamp.
if (timeRangeBytes == null) {
return true;
}
TimeRangeTracker timeRangeTracker = TimeRangeTracker.parseFrom(timeRangeBytes);
if (timeRangeTracker.getMin() < cutOffTimestamp) {
if (timeRangeTracker.getMax() > cutOffTimestamp) {
Expand Down
39 changes: 39 additions & 0 deletions .../java/org/apache/hadoop/hbase/regionserver/compactions/TestCustomCellTieredCompactor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@
*/
package org.apache.hadoop.hbase.regionserver.compactions;

import static org.apache.hadoop.hbase.HConstants.MAJOR_COMPACTION_PERIOD;
import static org.apache.hadoop.hbase.regionserver.CustomTieringMultiFileWriter.CUSTOM_TIERING_TIME_RANGE;
import static org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieringValueProvider.TIERING_CELL_QUALIFIER;
import static org.apache.hadoop.hbase.regionserver.compactions.CustomTieredCompactor.TIERING_VALUE_PROVIDER;
import static org.apache.hadoop.hbase.regionserver.compactions.RowKeyDateTieringValueProvider.TIERING_KEY_DATE_FORMAT;
import static org.apache.hadoop.hbase.regionserver.compactions.RowKeyDateTieringValueProvider.TIERING_KEY_DATE_PATTERN;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

import java.io.IOException;
Expand All @@ -41,6 +44,8 @@
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.regionserver.CustomTieredStoreEngine;
import org.apache.hadoop.hbase.regionserver.HStore;
import org.apache.hadoop.hbase.regionserver.HStoreFile;
import org.apache.hadoop.hbase.regionserver.TimeRangeTracker;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
Expand All @@ -64,6 +69,7 @@ public class TestCustomCellTieredCompactor {
public void setUp() throws Exception {
utility = new HBaseTestingUtil();
utility.getConfiguration().setInt("hbase.hfile.compaction.discharger.interval", 10);
utility.getConfiguration().setLong(MAJOR_COMPACTION_PERIOD, 10L);
utility.startMiniCluster();
}

Expand Down Expand Up @@ -316,4 +322,37 @@ public void testCustomCellTieredCompactorWithRowKeyDateTieringValue() throws Exc
}
});
}

@Test
public void testShouldPerformMajorCompactionWhenTimeRangeMetadataIsNull() throws Exception {
ColumnFamilyDescriptorBuilder clmBuilder = ColumnFamilyDescriptorBuilder.newBuilder(FAMILY);
clmBuilder.setValue("hbase.hstore.engine.class", CustomTieredStoreEngine.class.getName());
clmBuilder.setValue(TIERING_CELL_QUALIFIER, "date");
TableName tableName = TableName.valueOf("testShouldCompactWhenNoTimeRangeMetadata");
TableDescriptorBuilder tblBuilder = TableDescriptorBuilder.newBuilder(tableName);
tblBuilder.setColumnFamily(clmBuilder.build());
utility.getAdmin().createTable(tblBuilder.build());
utility.waitTableAvailable(tableName);
Connection connection = utility.getConnection();
Table table = connection.getTable(tableName);
long recordTime = System.currentTimeMillis();
// Write data and flush to create store files without CUSTOM_TIERING_TIME_RANGE metadata
for (int i = 0; i < 2; i++) {
Put put = new Put(Bytes.toBytes(i));
put.addColumn(FAMILY, Bytes.toBytes("val"), Bytes.toBytes("v" + i));
put.addColumn(FAMILY, Bytes.toBytes("date"), Bytes.toBytes(recordTime));
table.put(put);
utility.flush(tableName);
}
table.close();

HStore store =
(HStore) utility.getMiniHBaseCluster().getRegions(tableName).get(0).getStore(FAMILY);
// Verify that flushed files do not have CUSTOM_TIERING_TIME_RANGE metadata
for (HStoreFile sf : store.getStorefiles()) {
assertNull(sf.getMetadataValue(CUSTOM_TIERING_TIME_RANGE));
}
// shouldPerformMajorCompaction must return true due to null timeRangeBytes
assertTrue(store.shouldPerformMajorCompaction());
}
}