Revert "HBASE-26450 Server configuration will overwrite HStore configuration … (#3843)"
This reverts commit 628b8b7f650dc2053c2ddf8559d945817c25b894.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index 32693ab..47cb795 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -59,6 +59,7 @@
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;
@@ -66,6 +67,7 @@
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;
@@ -2520,11 +2522,10 @@
@Override
public void onConfigurationChange(Configuration conf) {
- Configuration storeConf = StoreUtils.createStoreConfiguration(conf, region.getTableDescriptor(),
+ this.conf = StoreUtils.createStoreConfiguration(conf, region.getTableDescriptor(),
getColumnFamilyDescriptor());
- this.conf = storeConf;
- this.storeEngine.compactionPolicy.setConf(storeConf);
- this.offPeakHours = OffPeakHours.getInstance(storeConf);
+ this.storeEngine.compactionPolicy.setConf(conf);
+ this.offPeakHours = OffPeakHours.getInstance(conf);
}
/**
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
index 7491068..6618742 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
@@ -2141,29 +2141,6 @@
}
}
- @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);
