This is an automated email from the ASF dual-hosted git repository.
lupeng pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-3 by this push:
new 854269fdd27 HBASE-29184 The snapshot type for disabled table is
incorrect when snapshot procedure is enabled (#6790)
854269fdd27 is described below
commit 854269fdd27ea8dd3b92989b41496befebc50593
Author: Peng Lu <[email protected]>
AuthorDate: Sat Aug 23 17:39:47 2025 +0800
HBASE-29184 The snapshot type for disabled table is incorrect when snapshot
procedure is enabled (#6790)
Signed-off-by: Pankaj Kumar <[email protected]>
Signed-off-by: Chandra Kambham <[email protected]>
---
.../hbase/master/procedure/SnapshotProcedure.java | 5 +-
.../master/procedure/TestSnapshotProcedure.java | 3 +
.../TestSnapshotProcedureForSnapshotType.java | 92 ++++++++++++++++++++++
3 files changed, 99 insertions(+), 1 deletion(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/SnapshotProcedure.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/SnapshotProcedure.java
index 17a9c083896..767ae12dfb2 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/SnapshotProcedure.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/SnapshotProcedure.java
@@ -64,6 +64,7 @@ import
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.S
import
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.SnapshotState;
import
org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos.ProcedureState;
import
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;
+import
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription.Type;
/**
* A procedure used to take snapshot on tables.
@@ -121,14 +122,16 @@ public class SnapshotProcedure extends
AbstractStateMachineTableProcedure<Snapsh
setNextState(SnapshotState.SNAPSHOT_WRITE_SNAPSHOT_INFO);
return Flow.HAS_MORE_STATE;
case SNAPSHOT_WRITE_SNAPSHOT_INFO:
- SnapshotDescriptionUtils.writeSnapshotInfo(snapshot, workingDir,
workingDirFS);
TableState tableState =
env.getMasterServices().getTableStateManager().getTableState(snapshotTable);
if (tableState.isEnabled()) {
setNextState(SnapshotState.SNAPSHOT_SNAPSHOT_ONLINE_REGIONS);
} else if (tableState.isDisabled()) {
+ // Set the snapshot type to DISABLED as the table is in DISABLED
state
+ snapshot = snapshot.toBuilder().setType(Type.DISABLED).build();
setNextState(SnapshotState.SNAPSHOT_SNAPSHOT_CLOSED_REGIONS);
}
+ SnapshotDescriptionUtils.writeSnapshotInfo(snapshot, workingDir,
workingDirFS);
return Flow.HAS_MORE_STATE;
case SNAPSHOT_SNAPSHOT_ONLINE_REGIONS:
addChildProcedure(createRemoteSnapshotProcedures(env));
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSnapshotProcedure.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSnapshotProcedure.java
index 84a3e84763b..4d36080c5bd 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSnapshotProcedure.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSnapshotProcedure.java
@@ -27,6 +27,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.SnapshotDescription;
import org.apache.hadoop.hbase.client.SnapshotType;
import org.apache.hadoop.hbase.client.Table;
@@ -72,6 +73,7 @@ public class TestSnapshotProcedure {
protected String SNAPSHOT_NAME;
protected SnapshotDescription snapshot;
protected SnapshotProtos.SnapshotDescription snapshotProto;
+ protected Admin admin;
public static final class DelaySnapshotProcedure extends SnapshotProcedure {
public DelaySnapshotProcedure() {
@@ -109,6 +111,7 @@ public class TestSnapshotProcedure {
config.setInt(RemoteProcedureDispatcher.DISPATCH_MAX_QUEUE_SIZE_CONF_KEY,
128);
TEST_UTIL.startMiniCluster(3);
master = TEST_UTIL.getHBaseCluster().getMaster();
+ admin = TEST_UTIL.getAdmin();
TABLE_NAME = TableName.valueOf(Bytes.toBytes("SPTestTable"));
CF = Bytes.toBytes("cf");
SNAPSHOT_NAME = "SnapshotProcedureTest";
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSnapshotProcedureForSnapshotType.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSnapshotProcedureForSnapshotType.java
new file mode 100644
index 00000000000..58415ff959a
--- /dev/null
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSnapshotProcedureForSnapshotType.java
@@ -0,0 +1,92 @@
+/*
+ * 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.master.procedure;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.Optional;
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
+import org.apache.hadoop.hbase.client.SnapshotDescription;
+import org.apache.hadoop.hbase.client.SnapshotType;
+import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
+import org.apache.hadoop.hbase.testclassification.MasterTests;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
+@Category({ MasterTests.class, MediumTests.class })
+public class TestSnapshotProcedureForSnapshotType extends
TestSnapshotProcedure {
+
+ @ClassRule
+ public static final HBaseClassTestRule CLASS_RULE =
+ HBaseClassTestRule.forClass(TestSnapshotProcedureForSnapshotType.class);
+
+ @Rule
+ public TestName name = new TestName();
+
+ @Test
+ public void testSnapshotTypeForEnabledTable() throws IOException {
+ TableName tableName = TableName.valueOf(name.getMethodName());
+ String snapshotName = "snapshot_" + name.getMethodName();
+ TableDescriptorBuilder tableDescriptorBuilder =
TableDescriptorBuilder.newBuilder(tableName);
+ ColumnFamilyDescriptor columnFamilyDescriptor =
+ ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("info")).build();
+ tableDescriptorBuilder.setColumnFamily(columnFamilyDescriptor);
+ admin.createTable(tableDescriptorBuilder.build());
+
+ assertTrue(admin.tableExists(tableName));
+ assertTrue(admin.isTableEnabled(tableName));
+
+ admin.snapshot(snapshotName, tableName);
+ Optional<SnapshotDescription> optional =
+ admin.listSnapshots().stream().filter(s ->
snapshotName.equals(s.getName())).findFirst();
+ SnapshotDescription snapshotDescription = optional.orElseThrow();
+ assertEquals(SnapshotType.FLUSH, snapshotDescription.getType());
+ }
+
+ @Test
+ public void testSnapshotTypeForDisabledTable() throws IOException {
+ TableName tableName = TableName.valueOf(name.getMethodName());
+ String snapshotName = "snapshot_" + name.getMethodName();
+ TableDescriptorBuilder tableDescriptorBuilder =
TableDescriptorBuilder.newBuilder(tableName);
+ ColumnFamilyDescriptor columnFamilyDescriptor =
+ ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("info")).build();
+ tableDescriptorBuilder.setColumnFamily(columnFamilyDescriptor);
+ admin.createTable(tableDescriptorBuilder.build());
+ assertTrue(admin.tableExists(tableName));
+ assertTrue(admin.isTableEnabled(tableName));
+
+ admin.disableTable(tableName);
+ assertTrue(admin.isTableDisabled(tableName));
+
+ admin.snapshot(snapshotName, tableName);
+ Optional<SnapshotDescription> optional =
+ admin.listSnapshots().stream().filter(s ->
snapshotName.equals(s.getName())).findFirst();
+ SnapshotDescription snapshotDescription = optional.orElseThrow();
+ assertEquals(SnapshotType.DISABLED, snapshotDescription.getType());
+ }
+}
