Skip to content

HBASE-26450 Server configuration will overwrite HStore configuration … #3843

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

Merged
GeorryHuang merged 2 commits into from
Nov 12, 2021
Merged

HBASE-26450 Server configuration will overwrite HStore configuration … #3843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be1d9f3
HBASE-26450 Server configuration will overwrite HStore configuration …
GeorryHuang Nov 11, 2021
51111d6
formate code
GeorryHuang Nov 12, 2021
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
9 changes: 4 additions & 5 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,13 @@
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellComparator;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.CompoundConfiguration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.MemoryCompactionPolicy;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.FailedArchiveException;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.conf.ConfigurationManager;
import org.apache.hadoop.hbase.conf.PropagatingConfigurationObserver;
import org.apache.hadoop.hbase.coprocessor.ReadOnlyConfiguration;
Expand Down Expand Up @@ -2522,10 +2520,11 @@ protected OffPeakHours getOffPeakHours() {

@Override
public void onConfigurationChange(Configuration conf) {
this.conf = StoreUtils.createStoreConfiguration(conf, region.getTableDescriptor(),
Configuration storeConf = StoreUtils.createStoreConfiguration(conf, region.getTableDescriptor(),
getColumnFamilyDescriptor());
this.storeEngine.compactionPolicy.setConf(conf);
this.offPeakHours = OffPeakHours.getInstance(conf);
this.conf = storeConf;
this.storeEngine.compactionPolicy.setConf(storeConf);
Copy link
Contributor

@Apache9 Apache9 Nov 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, so the problem is here, the 'conf' here is the conf from the parameter, not 'this.conf'...

Copy link
Contributor Author

@GeorryHuang GeorryHuang Nov 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Precisely!

this.offPeakHours = OffPeakHours.getInstance(storeConf);
}

/**
Expand Down
23 changes: 23 additions & 0 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2141,6 +2141,29 @@ public void testFlattenSnapshotWriteCompactingMemeStoreConcurrently() throws Exc
}
}

@Test
public void testOnConfigurationChange() throws IOException {
final int COMMON_MAX_FILES_TO_COMPACT = 10;
final int NEW_COMMON_MAX_FILES_TO_COMPACT = 8;
final int STORE_MAX_FILES_TO_COMPACT = 6;

//Build a table that its maxFileToCompact different from common configuration.
Configuration conf = HBaseConfiguration.create();
conf.setInt(CompactionConfiguration.HBASE_HSTORE_COMPACTION_MAX_KEY,
COMMON_MAX_FILES_TO_COMPACT);
ColumnFamilyDescriptor hcd = ColumnFamilyDescriptorBuilder.newBuilder(family)
.setConfiguration(CompactionConfiguration.HBASE_HSTORE_COMPACTION_MAX_KEY,
String.valueOf(STORE_MAX_FILES_TO_COMPACT)).build();
init(this.name.getMethodName(), conf, hcd);

//After updating common configuration, the conf in HStore itself must not be changed.
conf.setInt(CompactionConfiguration.HBASE_HSTORE_COMPACTION_MAX_KEY,
NEW_COMMON_MAX_FILES_TO_COMPACT);
this.store.onConfigurationChange(conf);
assertEquals(STORE_MAX_FILES_TO_COMPACT,
store.getStoreEngine().getCompactionPolicy().getConf().getMaxFilesToCompact());
}

private HStoreFile mockStoreFileWithLength(long length) {
HStoreFile sf = mock(HStoreFile.class);
StoreFileReader sfr = mock(StoreFileReader.class);
Expand Down