fix: disambiguate cluster_id <-> instance_id#2472
Closed
MasterPtato wants to merge 1 commit into
Closed
Conversation
Contributor
Author
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This PR disambiguates between cluster_id and instance_id across the Rivet codebase, clarifying that instance_id uniquely identifies the entire Rivet cluster while cluster_id refers to specific clusters within an instance.
- Renamed
cluster_idcolumn torivet_instance_idinpackages/core/services/dynamic-config/db/dynamic-config/migrations/20250523120501_instance_id.up.sql - Added
instance_idfield to Rivet configuration inpackages/common/config/src/config/server/rivet/mod.rs - Updated telemetry beacon in
packages/core/services/telemetry/standalone/beacon/src/lib.rsto use instance_id for tracking - Modified
get_config.rsto handle instance_id with clear documentation about its purpose - Added instance_id support in worker and guard configurations for consistent identification
6 file(s) reviewed, 5 comment(s)
Edit PR Review Bot Settings | Greptile
Comment on lines
+1
to
+2
| ALTER TABLE config | ||
| RENAME COLUMN cluster_id TO rivet_instance_id; |
There was a problem hiding this comment.
logic: This migration will break get_config.rs which still references the cluster_id column in its SQL queries. Update all dependent code before running this migration.
Comment on lines
+63
to
+66
| /// If specified, will use this as the default cluster ID. | ||
| /// | ||
| /// This will have no effect if applied after the cluster has first ran. | ||
| pub instance_id: Option<Uuid>, |
There was a problem hiding this comment.
logic: Documentation comment appears to be incorrect - refers to 'default cluster ID' but this is for instance_id
| } | ||
|
|
||
| impl Rivet { | ||
| impl Rivet { |
There was a problem hiding this comment.
syntax: Extra tab character after impl Rivet
Comment on lines
+20
to
21
| // Pick an instance ID to insert if none exists. If this is specified in the config. fall back to | ||
| // this. |
There was a problem hiding this comment.
syntax: Comment has a period in the middle of a sentence: 'If this is specified in the config. fall back to'
Suggested change
| // Pick an instance ID to insert if none exists. If this is specified in the config. fall back to | |
| // this. | |
| // Pick an instance ID to insert if none exists. If this is specified in the config, fall back to | |
| // this. |
Comment on lines
+193
to
+195
| // /// This is helpful for diagnosing issues with the self-hosted instances under | ||
| // /// load. e.g. if a instance is running on constraint resources (see os_report), | ||
| // /// does the instance configuration affect it? |
There was a problem hiding this comment.
syntax: typo: 'constraint resources' should be 'constrained resources'
Suggested change
| // /// This is helpful for diagnosing issues with the self-hosted instances under | |
| // /// load. e.g. if a instance is running on constraint resources (see os_report), | |
| // /// does the instance configuration affect it? | |
| // /// This is helpful for diagnosing issues with the self-hosted instances under | |
| // /// load. e.g. if a instance is running on constrained resources (see os_report), | |
| // /// does the instance configuration affect it? |
Deploying rivet with
|
| Latest commit: |
08baa4f
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://9b743418.rivet.pages.dev |
| Branch Preview URL: | https://graphite-base-2473.rivet.pages.dev |
Contributor
Merge activity
|
graphite-app Bot
pushed a commit
that referenced
this pull request
May 26, 2025
<!-- Please make sure there is an issue that this PR is correlated to. --> ## Changes <!-- If there are frontend changes, please include screenshots. -->
This was referenced May 27, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Changes