Skip to content

Refactor/remove separate merge mechanism #792

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

Open
siegfriedweber wants to merge 2 commits into
base: refactor/remove-product-config
Choose a base branch
from
Open

Refactor/remove separate merge mechanism #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccba698
refactor: Remove separate merge mechanism
siegfriedweber Jun 11, 2026
158ae0e
test(smoke): Add jvmArgumentOverrides
siegfriedweber Jun 11, 2026
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 Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions Cargo.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ tracing = "0.1"
tracing-futures = { version = "0.2", features = ["futures-03"] }

[patch."https://github.com/stackabletech/operator-rs.git"]
stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "smooth-operator" }
stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "jvm-argument-overrides" }
# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
18 changes: 9 additions & 9 deletions crate-hashes.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 22 additions & 24 deletions rust/operator-binary/src/config/jvm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ use snafu::{ResultExt, Snafu};
use stackable_operator::{
k8s_openapi::api::core::v1::ResourceRequirements,
memory::{BinaryMultiple, MemoryQuantity},
role_utils::JvmArgumentOverrides,
v2::jvm_argument_overrides::JvmArgumentOverrides,
};

use crate::{
controller::build::properties::ConfigFileName,
crd::{HdfsNodeRole, v1alpha1},
controller::build::properties::ConfigFileName, crd::HdfsNodeRole,
security::kerberos::KERBEROS_CONTAINER_PATH,
};

Expand All @@ -20,9 +19,6 @@ pub enum Error {
source: stackable_operator::memory::Error,
role: String,
},

#[snafu(display("failed to merge jvm argument overrides"))]
MergeJvmArgumentOverrides { source: crate::crd::Error },
}

// All init or sidecar containers must have access to the following settings.
Expand Down Expand Up @@ -51,9 +47,8 @@ pub fn construct_global_jvm_args(kerberos_enabled: bool) -> String {
}

pub fn construct_role_specific_jvm_args(
hdfs: &v1alpha1::HdfsCluster,
hdfs_role: &HdfsNodeRole,
role_group: &str,
jvm_argument_overrides: &JvmArgumentOverrides,
kerberos_enabled: bool,
resources: Option<&ResourceRequirements>,
config_dir: &str,
Expand Down Expand Up @@ -91,21 +86,20 @@ pub fn construct_role_specific_jvm_args(
));
}

let operator_generated = JvmArgumentOverrides::new_with_only_additions(jvm_args);
let merged_jvm_args = hdfs
.get_merged_jvm_argument_overrides(hdfs_role, role_group, &operator_generated)
.context(MergeJvmArgumentOverridesSnafu)?;
let merged_jvm_args = jvm_argument_overrides.apply_to(jvm_args);

Ok(merged_jvm_args
.effective_jvm_config_after_merging()
.join(" "))
Ok(merged_jvm_args.join(" "))
}

#[cfg(test)]
mod tests {

use super::*;
use crate::{container::ContainerConfig, crd::constants::DEFAULT_NAME_NODE_METRICS_PORT};
use crate::{
container::ContainerConfig,
crd::constants::DEFAULT_NAME_NODE_METRICS_PORT,
test_support::{deserialize_and_validate_cluster, role_group_config},
};

#[test]
fn test_global_jvm_args() {
Expand All @@ -123,6 +117,8 @@ mod tests {
kind: HdfsCluster
metadata:
name: hdfs
namespace: test
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
spec:
image:
productVersion: 3.4.2
Expand Down Expand Up @@ -151,6 +147,8 @@ mod tests {
kind: HdfsCluster
metadata:
name: hdfs
namespace: test
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
spec:
image:
productVersion: 3.4.2
Expand Down Expand Up @@ -196,18 +194,18 @@ mod tests {
}

fn construct_test_role_specific_jvm_args(hdfs_cluster: &str, kerberos_enabled: bool) -> String {
let hdfs: v1alpha1::HdfsCluster =
serde_yaml::from_str(hdfs_cluster).expect("illegal test input");

let role = HdfsNodeRole::Name;
let merged_config = role.merged_config(&hdfs, "default").unwrap();
let container_config = ContainerConfig::from(role);
let resources = container_config.resources(&merged_config);

let validated_cluster = deserialize_and_validate_cluster(hdfs_cluster);
let role_group_config = role_group_config(&validated_cluster, &role, "default");

let resources = ContainerConfig::from(role).resources(&role_group_config.config);

construct_role_specific_jvm_args(
&hdfs,
&role,
"default",
&role_group_config
.product_specific_common_config
.jvm_argument_overrides,
kerberos_enabled,
resources.as_ref(),
"/stackable/config",
Expand Down
Loading
Loading