Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(meta): fix column binding for fragment ids #16133

Merged
merged 1 commit into from
Apr 7, 2024
Merged

fix(meta): fix column binding for fragment ids #16133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/meta/src/controller/fragment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ use risingwave_meta_model_v2::actor::ActorStatus;
use risingwave_meta_model_v2::fragment::StreamNode;
use risingwave_meta_model_v2::prelude::{Actor, ActorDispatcher, Fragment, Sink, StreamingJob};
use risingwave_meta_model_v2::{
actor, actor_dispatcher, fragment, object, sink, streaming_job, ActorId, ConnectorSplits,
ExprContext, FragmentId, FragmentVnodeMapping, I32Array, JobStatus, ObjectId, SinkId, SourceId,
StreamingParallelism, TableId, VnodeBitmap, WorkerId,
actor, actor_dispatcher, fragment, object, sink, streaming_job, ActorId, ActorUpstreamActors,
ConnectorSplits, ExprContext, FragmentId, FragmentVnodeMapping, I32Array, JobStatus, ObjectId,
SinkId, SourceId, StreamingParallelism, TableId, VnodeBitmap, WorkerId,
};
use risingwave_pb::common::PbParallelUnit;
use risingwave_pb::meta::subscribe_response::{
Expand Down Expand Up @@ -1094,9 +1094,9 @@ impl CatalogController {
pub async fn get_running_actors_and_upstream_of_fragment(
&self,
fragment_id: FragmentId,
) -> MetaResult<Vec<(ActorId, Vec<ActorId>)>> {
) -> MetaResult<Vec<(ActorId, ActorUpstreamActors)>> {
let inner = self.inner.read().await;
let actors: Vec<(ActorId, Vec<ActorId>)> = Actor::find()
let actors: Vec<(ActorId, ActorUpstreamActors)> = Actor::find()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How did you find this is wrong? 🤡

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was running some tests locally and the meta failed to restart when load_backfill_fragment_ids. 🥵

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, does it means that this is a serious bug and we need to patch it ASAP?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😄 no worries, these part of codes are not in the release 1.8.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this can be triggered whenever any fragment is created (why?), like CREATE TABLE t(), and then restart risingwave.

.select_only()
.column(actor::Column::ActorId)
.column(actor::Column::UpstreamActorIds)
Expand Down Expand Up @@ -1236,7 +1236,7 @@ impl CatalogController {
&self,
) -> MetaResult<HashMap<SourceId, BTreeSet<(FragmentId, FragmentId)>>> {
let inner = self.inner.read().await;
let mut fragments: Vec<(FragmentId, Vec<FragmentId>, i32, StreamNode)> = Fragment::find()
let mut fragments: Vec<(FragmentId, I32Array, i32, StreamNode)> = Fragment::find()
.select_only()
.columns([
fragment::Column::FragmentId,
Expand All @@ -1252,13 +1252,13 @@ impl CatalogController {
let mut source_fragment_ids = HashMap::new();
for (fragment_id, upstream_fragment_id, _, stream_node) in fragments {
if let Some(source_id) = stream_node.to_protobuf().find_source_backfill() {
if upstream_fragment_id.len() != 1 {
bail!("SourceBackfill should have only one upstream fragment, found {} for fragment {}", upstream_fragment_id.len(), fragment_id);
if upstream_fragment_id.inner_ref().len() != 1 {
bail!("SourceBackfill should have only one upstream fragment, found {} for fragment {}", upstream_fragment_id.inner_ref().len(), fragment_id);
}
source_fragment_ids
.entry(source_id as SourceId)
.or_insert_with(BTreeSet::new)
.insert((fragment_id, upstream_fragment_id[0]));
.insert((fragment_id, upstream_fragment_id.inner_ref()[0]));
}
}
Ok(source_fragment_ids)
Expand Down
3 changes: 2 additions & 1 deletion src/meta/src/controller/user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,8 @@ impl CatalogController {
if *privilege.with_grant_option.as_ref() {
on_conflict.update_columns([user_privilege::Column::WithGrantOption]);
} else {
on_conflict.do_nothing();
// Workaround to support MYSQL for `DO NOTHING`.
on_conflict.update_column(user_privilege::Column::UserId);
}

UserPrivilege::insert(privilege)
Expand Down
6 changes: 5 additions & 1 deletion src/meta/src/manager/metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,11 @@ impl MetadataManager {
.map(|(id, actors)| {
(
id as ActorId,
actors.into_iter().map(|id| id as ActorId).collect(),
actors
.into_inner()
.into_iter()
.flat_map(|(_, ids)| ids.into_iter().map(|id| id as ActorId))
.collect(),
)
})
.collect())
Expand Down
Loading