[BugFix] Prevent drop tablet during apply in RowsetUpdateStateTest.wi…

…th_deletes (StarRocks#55548) Signed-off-by: Binglin Chang <decstery@gmail.com>
macdoor · Feb 6, 2025 · cc437c9 · cc437c9
1 parent e6a5426
commit cc437c9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/be/src/storage/rowset/rowset_writer.cpp b/be/src/storage/rowset/rowset_writer.cpp
@@ -684,8 +684,8 @@ Status HorizontalRowsetWriter::flush_chunk_with_deletes(const Chunk& upserts, co
             wopts.encryption_info = pair.info;
             encryption_meta = std::move(pair.encryption_meta);
         }
-        ASSIGN_OR_RETURN(auto wfile, _fs->new_writable_file(Rowset::segment_del_file_path(
-                                             _context.rowset_path_prefix, _context.rowset_id, _num_delfile)));
+        auto file_path = Rowset::segment_del_file_path(_context.rowset_path_prefix, _context.rowset_id, _num_delfile);
+        ASSIGN_OR_RETURN(auto wfile, _fs->new_writable_file(wopts, file_path));
         size_t sz = serde::ColumnArraySerde::max_serialized_size(deletes);
         std::vector<uint8_t> content(sz);
         if (serde::ColumnArraySerde::serialize(deletes, content.data()) == nullptr) {

diff --git a/be/src/storage/tablet_updates.cpp b/be/src/storage/tablet_updates.cpp
@@ -622,7 +622,7 @@ Status TabletUpdates::get_apply_version_and_rowsets(int64_t* version, std::vecto
     return Status::OK();
 }
 
-Status TabletUpdates::rowset_commit(int64_t version, const RowsetSharedPtr& rowset, uint32_t wait_time,
+Status TabletUpdates::rowset_commit(int64_t version, const RowsetSharedPtr& rowset, uint32_t wait_time_ms,
                                     bool is_version_overwrite, bool is_double_write) {
     auto span = Tracer::Instance().start_trace("rowset_commit");
     auto scope_span = trace::Scope(span);
@@ -699,8 +699,8 @@ Status TabletUpdates::rowset_commit(int64_t version, const RowsetSharedPtr& rows
             }
             _try_commit_pendings_unlocked();
             _check_for_apply();
-            if (wait_time > 0) {
-                st = _wait_for_version(EditVersion(version, 0), wait_time, ul);
+            if (wait_time_ms > 0) {
+                st = _wait_for_version(EditVersion(version, 0), wait_time_ms, ul);
             }
         }
     }

diff --git a/be/src/storage/tablet_updates.h b/be/src/storage/tablet_updates.h
@@ -153,7 +153,7 @@ class TabletUpdates {
 
     Status get_rowsets_total_stats(const std::vector<uint32_t>& rowsets, size_t* total_rows, size_t* total_dels);
 
-    Status rowset_commit(int64_t version, const RowsetSharedPtr& rowset, uint32_t wait_time,
+    Status rowset_commit(int64_t version, const RowsetSharedPtr& rowset, uint32_t wait_time_ms,
                          bool is_version_overwrite = false, bool is_double_write = false);
 
     // should only called by UpdateManager's apply thread

diff --git a/be/test/storage/rowset_update_state_test.cpp b/be/test/storage/rowset_update_state_test.cpp
@@ -239,7 +239,7 @@ TEST_F(RowsetUpdateStateTest, with_deletes) {
     Int64Column deletes;
     deletes.append_numbers(delete_keys.data(), sizeof(int64_t) * delete_keys.size());
     RowsetSharedPtr rowset = create_rowset(_tablet, keys, &deletes);
-    auto st = _tablet->rowset_commit(2, rowset, 0);
+    auto st = _tablet->rowset_commit(2, rowset, 2000);
     ASSERT_TRUE(st.ok()) << st.to_string();
     ASSERT_EQ(2, _tablet->updates()->max_version());
 }