support schema change thread fast fail

apache · Sep 11, 2024 · 3e48d2a · 3e48d2a
1 parent 91afeec
commit 3e48d2a
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/be/src/olap/schema_change.cpp b/be/src/olap/schema_change.cpp
@@ -508,7 +508,14 @@ Status VSchemaChangeDirectly::_inner_process(RowsetReaderSharedPtr rowset_reader
                                              TabletSchemaSPtr base_tablet_schema,
                                              TabletSchemaSPtr new_tablet_schema) {
     bool eof = false;
+    int64_t tablet_id = new_tablet->tablet_id();
     do {
+        // tablet may be dropped due to user cancel, schema change thread should fast fail 
+        // and release tablet lock.
+        if (StorageEngine::instance()->tablet_manager()->get_tablet(tablet_id) == nullptr) {
+            return Status::Error<TABLE_NOT_FOUND>("fail to find tablet. tablet_id={}", 
+                                                tablet_id);
+        }
         auto new_block = vectorized::Block::create_unique(new_tablet_schema->create_block());
         auto ref_block = vectorized::Block::create_unique(base_tablet_schema->create_block());
 
@@ -578,7 +585,14 @@ Status VBaseSchemaChangeWithSorting::_inner_process(RowsetReaderSharedPtr rowset
     auto new_block = vectorized::Block::create_unique(new_tablet_schema->create_block());
 
     bool eof = false;
+    int64_t tablet_id = new_tablet->tablet_id();
     do {
+        // tablet may be dropped due to user cancel, schema change thread should fast fail 
+        // and release tablet lock.
+        if (StorageEngine::instance()->tablet_manager()->get_tablet(tablet_id) == nullptr) {
+            return Status::Error<TABLE_NOT_FOUND>("fail to find tablet. tablet_id={}", 
+                                                tablet_id);
+        }
         auto ref_block = vectorized::Block::create_unique(base_tablet_schema->create_block());
         auto st = rowset_reader->next_block(ref_block.get());
         if (!st) {