Skip to content

rename ingester to ingestor in migration #806

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

Merged
merged 3 commits into from
Jun 7, 2024
Merged

rename ingester to ingestor in migration #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36abfe2
rename ingester to ingestor in migration
nikhilsinhaparseable Jun 4, 2024
fc92543
migrate metadata to v4
nikhilsinhaparseable Jun 4, 2024
de10480
Merge branch 'main' into rename-ingestor-migration
nikhilsinhaparseable Jun 6, 2024
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
20 changes: 12 additions & 8 deletions server/src/migration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,18 @@ pub async fn run_metadata_migration(config: &Config) -> anyhow::Result<()> {
if let Some(storage_metadata) = storage_metadata {
match get_version(&storage_metadata) {
Some("v1") => {
let metadata = metadata_migration::v1_v3(storage_metadata);
let mut metadata = metadata_migration::v1_v3(storage_metadata);
metadata = metadata_migration::v3_v4(metadata);
put_remote_metadata(&*object_store, &metadata).await?;
}
Some("v2") => {
let metadata = metadata_migration::v2_v3(storage_metadata);
let mut metadata = metadata_migration::v2_v3(storage_metadata);
metadata = metadata_migration::v3_v4(metadata);
put_remote_metadata(&*object_store, &metadata).await?;
}
Some("v3") => {
let mdata = metadata_migration::update_v3(storage_metadata);
put_remote_metadata(&*object_store, &mdata).await?;
let metadata = metadata_migration::v3_v4(storage_metadata);
put_remote_metadata(&*object_store, &metadata).await?;
}
_ => (),
}
Expand All @@ -73,16 +75,18 @@ pub async fn run_metadata_migration(config: &Config) -> anyhow::Result<()> {
if let Some(staging_metadata) = staging_metadata {
match get_version(&staging_metadata) {
Some("v1") => {
let metadata = metadata_migration::v1_v3(staging_metadata);
let mut metadata = metadata_migration::v1_v3(staging_metadata);
metadata = metadata_migration::v3_v4(metadata);
put_staging_metadata(config, &metadata)?;
}
Some("v2") => {
let metadata = metadata_migration::v2_v3(staging_metadata);
let mut metadata = metadata_migration::v2_v3(staging_metadata);
metadata = metadata_migration::v3_v4(metadata);
put_staging_metadata(config, &metadata)?;
}
Some("v3") => {
let mdata = metadata_migration::update_v3(staging_metadata);
put_staging_metadata(config, &mdata)?;
let metadata = metadata_migration::v3_v4(staging_metadata);
put_staging_metadata(config, &metadata)?;
}
_ => (),
}
Expand Down
28 changes: 26 additions & 2 deletions server/src/migration/metadata_migration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,22 @@ pub fn v2_v3(mut storage_metadata: JsonValue) -> JsonValue {
// user is an object
let user = user.as_object_mut().unwrap();
// take out privileges
let JsonValue::Array(privileges) = user.remove("role").expect("role exists for v2") else {
let JsonValue::Array(mut privileges) = user.remove("role").expect("role exists for v2")
else {
panic!("privileges is an arrray")
};

let mut roles = Vec::new();

if !privileges.is_empty() {
for privilege in privileges.iter_mut() {
let privilege_value = privilege.get_mut("privilege");
if let Some(value) = privilege_value {
if value.as_str().unwrap() == "ingester" {
*value = JsonValue::String("ingestor".to_string());
}
}
}
let role_name =
rand::distributions::Alphanumeric.sample_string(&mut rand::thread_rng(), 8);
privileges_map.push((role_name.clone(), JsonValue::Array(privileges)));
Expand All @@ -110,8 +119,9 @@ pub fn v2_v3(mut storage_metadata: JsonValue) -> JsonValue {
}

// maybe rename
pub fn update_v3(mut storage_metadata: JsonValue) -> JsonValue {
pub fn v3_v4(mut storage_metadata: JsonValue) -> JsonValue {
let metadata = storage_metadata.as_object_mut().unwrap();
*metadata.get_mut("version").unwrap() = JsonValue::String("v4".to_string());
let sm = metadata.get("server_mode");

if sm.is_none() || sm.unwrap().as_str().unwrap() == "All" {
Expand All @@ -121,6 +131,20 @@ pub fn update_v3(mut storage_metadata: JsonValue) -> JsonValue {
);
}

let roles = metadata.get_mut("roles").unwrap().as_object_mut().unwrap();
for (_, privileges) in roles.iter_mut() {
let JsonValue::Array(privileges) = privileges else {
panic!("privileges is an array")
};
for privilege in privileges.iter_mut() {
let privilege_value = privilege.get_mut("privilege");
if let Some(value) = privilege_value {
if value.as_str().unwrap() == "ingester" {
*value = JsonValue::String("ingestor".to_string());
}
}
}
}
storage_metadata
}

Expand Down
Loading