Skip to content

Commit

Permalink
[Chore](runtime-filter) avoid dcheck fail when rf merge failed (#39172)
Browse files Browse the repository at this point in the history
## Proposed changes
 avoid dcheck fail when rf merge failed
there is a difference in the logic of calculating bf size between 2.1
and 3.0, so the merge will fail
this pr is to prevent core dump caused by dcheck failure during rolling
upgrade.
  • Loading branch information
BiteTheDDDDt authored Aug 10, 2024
1 parent 703a0dc commit 7bab58a
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions be/src/runtime/runtime_filter_mgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -396,12 +396,7 @@ Status RuntimeFilterMergeControllerEntity::merge(const PMergeFilterRequest* requ
RuntimeFilterWrapperHolder holder;
RETURN_IF_ERROR(IRuntimeFilter::create_wrapper(&params, holder.getHandle()));

auto st = cnt_val->filter->merge_from(holder.getHandle()->get());
if (!st) {
// prevent error ignored
DCHECK(false) << st.msg();
return st;
}
RETURN_IF_ERROR(cnt_val->filter->merge_from(holder.getHandle()->get()));

cnt_val->arrive_id.insert(UniqueId(request->fragment_instance_id()));
merged_size = cnt_val->arrive_id.size();
Expand Down

0 comments on commit 7bab58a

Please sign in to comment.