refactor: remove actorstatus enum and simplify actor state handling #23625
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove the ActorStatus enum and all related actor state tracking from the meta model and controller layers to simplify the codebase and metadata handling. - Delete `actor.rs` model file and remove the `status` field from ActorModel - Remove ActorState enum and `state` field from proto `ActorStatus` message, reserving the field number for backward compatibility - Update frontend catalog to hardcode actor state as "RUNNING" instead of reading from proto - Remove all conversions and references to PbActorState and actor status in service and controller code - Eliminate code rebuilding fragment mappings based on actor states and related tests This change reflects a design decision to treat all actors as implicitly running and to externalize or remove ephemeral state tracking from metadata, reducing complexity and maintenance overhead. Signed-off-by: Peng Chen <[email protected]>
shanicky
force-pushed
the
peng/remove-actor
branch
from
43ab7ee to
99ec052
Compare
github-actions
bot
added
type/refactor
There was a problem hiding this comment.
Pull Request Overview
This PR removes the concept of actor state (Inactive/Running) from the RisingWave metadata model. The changes simplify the codebase by eliminating unused state tracking infrastructure and treating all actors as running once they are created.
Key Changes
- Removed
ActorStateenum and relatedstatusfield fromActorModel - Deleted the entire
src/meta/model/src/actor.rsfile containing theActorStatusenum - Removed unused methods from
StreamJobFragments:update_actors_state,worker_actor_states,active_actors - Removed the
rebuild_fragment_mapping_from_actorshelper function - Reserved the
statefield in protobuf definitions for backward compatibility - Updated system catalog
rw_actorsto return hardcoded "RUNNING" state
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/meta/model/src/actor.rs | Entire file deleted - contained ActorStatus enum and ActorModel with status field |
| src/meta/model/src/lib.rs | Removed module declaration for actor.rs |
| src/meta/src/model/stream.rs | Removed unused methods and updated comment to reflect removal of actor status tracking |
| src/meta/src/controller/fragment.rs | Moved ActorModel definition here (without status field) and updated all usages |
| src/meta/src/controller/utils.rs | Removed status field from PartialActorLocation and deleted rebuild_fragment_mapping_from_actors function |
| src/meta/src/rpc/ddl_controller.rs | Removed status field initialization when creating actors |
| src/meta/service/src/stream_service.rs | Removed state field from ActorState response |
| src/frontend/src/catalog/system_catalog/rw_catalog/rw_actors.rs | Hardcoded state to "RUNNING" instead of reading from metadata |
| proto/meta.proto | Reserved state field in ActorStatus and ActorState messages for backward compatibility |
yezizp2012
approved these changes
Oct 31, 2025
src/meta/src/controller/fragment.rs
Outdated
| } | ||
|
|
||
| #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] | ||
| pub struct ActorModel { |
There was a problem hiding this comment.
Can we remove the Model key word as well?
There was a problem hiding this comment.
Should we just call it "Actor"? It feels a bit too general.
There was a problem hiding this comment.
Renamed it to ActorInfo and strictly limited the scope.
- Rename struct `ActorModel` to `ActorInfo` to clarify its role as actor metadata - Remove `pub` from `ActorInfo` to limit its usage to the module scope - Make `compose_table_fragments` and `compose_fragment` private to encapsulate internals - Update all function signatures and variables to use `ActorInfo` instead of `ActorModel` - Improve API encapsulation by reducing the public surface of fragment-related components Signed-off-by: Peng Chen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove the ActorStatus enum and all related actor state tracking from the meta model and controller layers to simplify the codebase and metadata handling.
actor.rsmodel file and remove thestatusfield from ActorModelstatefield from protoActorStatusmessage, reserving the field number for backward compatibilityThis change reflects a design decision to treat all actors as implicitly running and to externalize or remove ephemeral state tracking from metadata, reducing complexity and maintenance overhead.
I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.
close #23604 #23605
What's changed and what's your intention?
Summary
This PR removes the
ActorStatusenum and all associated actor state management logic from the meta and frontend codebases. Actor states are no longer tracked dynamically; instead, actors are assumed to be always"RUNNING", simplifying the system’s handling of actor lifecycle and status.Details
ActorStateenum and thestatefield from theActorStatusprotobuf message, reserving the field number for backward compatibility.actor.rsmodel containingActorStatusand thestatusfield fromActorModel."RUNNING"string (notably in the frontend catalog query and stream service).rebuild_fragment_mapping_from_actors).rw_actorsto report a constant actor state, reducing complexity and potential state inconsistencies.Checklist