You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by wc...@apache.org on 2025/07/10 10:03:40 UTC
(hbase) 12/18: HBASE-29424 Implement configuration validation for custom tiering compactions
This is an automated email from the ASF dual-hosted git repository.
wchevreuil pushed a commit to branch HBASE-29427
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit c44ae387f2692212315a51627ce7f73d61d4d650
Author: Wellington Ramos Chevreuil <wc...@apache.org>
AuthorDate: Tue Dec 10 14:57:42 2024 +0000
HBASE-29424 Implement configuration validation for custom tiering compactions
---
.../master/procedure/CreateTableProcedure.java | 3 ++
.../master/procedure/ModifyTableProcedure.java | 3 ++
.../compactions/CustomCellTieringUtils.java | 53 ++++++++++++++++++++++
3 files changed, 59 insertions(+)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java
index 23ad3b42aef..de2c9926340 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.master.MasterFileSystem;
import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;
import org.apache.hadoop.hbase.procedure2.ProcedureSuspendedException;
import org.apache.hadoop.hbase.procedure2.ProcedureUtil;
+import org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieringUtils;
import org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTrackerFactory;
import org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTrackerValidationUtils;
import org.apache.hadoop.hbase.rsgroup.RSGroupInfo;
@@ -314,6 +315,8 @@ public class CreateTableProcedure extends AbstractStateMachineTableProcedure<Cre
StoreFileTrackerValidationUtils.checkForCreateTable(env.getMasterConfiguration(),
tableDescriptor);
+ CustomCellTieringUtils.checkForModifyTable(tableDescriptor);
+
return true;
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java
index 03ad19799cd..bd3a9fe2fd4 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java
@@ -51,6 +51,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.ModifyTableState;
+import org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieringUtils;
+
@InterfaceAudience.Private
public class ModifyTableProcedure extends AbstractStateMachineTableProcedure<ModifyTableState> {
private static final Logger LOG = LoggerFactory.getLogger(ModifyTableProcedure.class);
@@ -420,6 +422,7 @@ public class ModifyTableProcedure extends AbstractStateMachineTableProcedure<Mod
// check for store file tracker configurations
StoreFileTrackerValidationUtils.checkForModifyTable(env.getMasterConfiguration(),
unmodifiedTableDescriptor, modifiedTableDescriptor, !isTableEnabled(env));
+ CustomCellTieringUtils.checkForModifyTable(modifiedTableDescriptor);
}
/**
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieringUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieringUtils.java
new file mode 100644
index 00000000000..2a8bd3b449b
--- /dev/null
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieringUtils.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.regionserver.compactions;
+
+import org.apache.hadoop.hbase.DoNotRetryIOException;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
+import org.apache.hadoop.hbase.client.TableDescriptor;
+import org.apache.hadoop.hbase.regionserver.StoreEngine;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import static org.apache.hadoop.hbase.regionserver.StoreEngine.STORE_ENGINE_CLASS_KEY;
+import static org.apache.hadoop.hbase.regionserver.compactions.CustomCellDateTieredCompactionPolicy.TIERING_CELL_QUALIFIER;
+
+@InterfaceAudience.Private
+public class CustomCellTieringUtils {
+
+ private static final Logger LOG = LoggerFactory.getLogger(CustomCellTieringUtils.class);
+
+ public static void checkForModifyTable(TableDescriptor newTable) throws IOException {
+ for(ColumnFamilyDescriptor descriptor : newTable.getColumnFamilies()) {
+ String storeEngineClassName = descriptor.getConfigurationValue(STORE_ENGINE_CLASS_KEY);
+ LOG.info("checking alter table for custom cell tiering on CF: {}. StoreEngine class: {}, "
+ + "TIERING_CELL_QUALIFIER: {}", Bytes.toString(descriptor.getName()),
+ storeEngineClassName, descriptor.getConfigurationValue(TIERING_CELL_QUALIFIER));
+ if (storeEngineClassName != null && storeEngineClassName.
+ contains("CustomCellTieredStoreEngine")) {
+ if( descriptor.getConfigurationValue(TIERING_CELL_QUALIFIER) == null ) {
+ throw new DoNotRetryIOException("StoreEngine " + storeEngineClassName +
+ " is missing required " + TIERING_CELL_QUALIFIER + " parameter.");
+ }
+ }
+ }
+ }
+
+}