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.

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

refactor: remove drop_actors rpc and simplify barrier worker state #18354

Merged
merged 14 commits into from
Sep 6, 2024

Conversation

wenym1
Copy link
Contributor

@wenym1 wenym1 commented Sep 2, 2024

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Extension of #18270.

In #18270, we spawn actor in inject barrier, and there is no not-started actor any more. In this PR, we further simplify the actor state of local barrier worker. The NotStarted actor status is removed, and all actor related info, including join handles, are all managed in the InflightActorState and StreamActorManagerState is removed.

The drop_actors rpc is removed, because there is no need to use it. The drop actor info is carried in the barrier, and the info of the dropped actor can be removed when the barrier is completed locally.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

@@ -416,32 +424,27 @@ impl PartialGraphManagedBarrierState {
}
}

pub(super) struct ManagedBarrierState {
pub(crate) struct ManagedBarrierState {
pub(super) actor_states: HashMap<ActorId, InflightActorState>,
Copy link
Member

Choose a reason for hiding this comment

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

May I know what "inflight" in InflightActor is for?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It has no special meaning. I guess the name was following the InflightActorInfo previously in the meta node global barrier manager.

Comment on lines +676 to +678
if let Some(actors_to_stop) = barrier.all_stop_actors() {
self.current_shared_context.drop_actors(actors_to_stop);
}
Copy link
Member

Choose a reason for hiding this comment

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

Can we also move this clean-up step into collect -> is_finished?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

At the beginning I implement it in this way, but later I realize that we also need to clean up the actor infos in other compute node, but the collect -> is_finished can only clean up the actor on this compute node. So now I changed to clean up here.

Copy link
Member

@yezizp2012 yezizp2012 left a comment

Choose a reason for hiding this comment

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

LGTM!

@wenym1 wenym1 added this pull request to the merge queue Sep 6, 2024
Merged via the queue into main with commit 7d3f285 Sep 6, 2024
32 of 34 checks passed
@wenym1 wenym1 deleted the yiming/deprecate-drop-actors branch September 6, 2024 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants