From 372508135280ffbcd17c2e933c3752b9ca65e697 Mon Sep 17 00:00:00 2001 From: Chen Zhang Date: Tue, 28 Feb 2023 19:52:00 +0800 Subject: [PATCH 1/2] change cu compaction correctness check to warning --- be/src/olap/compaction.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/be/src/olap/compaction.cpp b/be/src/olap/compaction.cpp index b405e33815b663..9e53067b9bc3af 100644 --- a/be/src/olap/compaction.cpp +++ b/be/src/olap/compaction.cpp @@ -434,12 +434,12 @@ Status Compaction::modify_rowsets(const Merger::Statistics* stats) { RETURN_IF_ERROR(_tablet->check_rowid_conversion(_output_rowset, location_map)); if (compaction_type() == READER_CUMULATIVE_COMPACTION) { - std::string err_msg = - "The merged rows is not equal to missed rows in rowid conversion"; + std::string err_msg = fmt::format( + "cumulative compaction: the merged rows({}) is not equal to missed " + "rows({}) in rowid conversion, tablet_id: {}, table_id:{}", + stats->merged_rows, missed_rows, _tablet->tablet_id(), _tablet->table_id()); DCHECK(stats != nullptr || stats->merged_rows == missed_rows) << err_msg; - if (stats != nullptr && stats->merged_rows != missed_rows) { - return Status::InternalError(err_msg); - } + LOG(WARNING) << err_msg; } _tablet->merge_delete_bitmap(output_rowset_delete_bitmap); From e677ecd98dc14934af8ce728d78450cad59b9968 Mon Sep 17 00:00:00 2001 From: Chen Zhang Date: Wed, 1 Mar 2023 20:51:24 +0800 Subject: [PATCH 2/2] update --- be/src/olap/compaction.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/be/src/olap/compaction.cpp b/be/src/olap/compaction.cpp index 9e53067b9bc3af..dcafd2a2798844 100644 --- a/be/src/olap/compaction.cpp +++ b/be/src/olap/compaction.cpp @@ -438,8 +438,10 @@ Status Compaction::modify_rowsets(const Merger::Statistics* stats) { "cumulative compaction: the merged rows({}) is not equal to missed " "rows({}) in rowid conversion, tablet_id: {}, table_id:{}", stats->merged_rows, missed_rows, _tablet->tablet_id(), _tablet->table_id()); - DCHECK(stats != nullptr || stats->merged_rows == missed_rows) << err_msg; - LOG(WARNING) << err_msg; + DCHECK(stats == nullptr || stats->merged_rows == missed_rows) << err_msg; + if (stats != nullptr && stats->merged_rows != missed_rows) { + LOG(WARNING) << err_msg; + } } _tablet->merge_delete_bitmap(output_rowset_delete_bitmap);