implement jvm overrides for the connect server

Author: razvan

Cargo.lock

@@ -35,5 +35,5 @@ indoc = "2"
 
 # TODO: revert before merging
 [patch."https://github.com/stackabletech/operator-rs.git"]
-stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "feat/support-deployment" }
+stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
 # stackable-operator = { path = "../operator-rs/crates/stackable-operator" }

Cargo.nix

@@ -42,6 +42,7 @@ use stackable_operator::{
             CustomContainerLogConfig,
         },
     },
+    role_utils::{JavaCommonConfig, JvmArgumentOverrides},
     time::Duration,
 };
 use strum::{Display, EnumDiscriminants, IntoStaticStr};
@@ -67,6 +68,11 @@ const DUMMY_SPARK_CONNECT_GROUP_NAME: &str = "default";
 #[strum_discriminants(derive(IntoStaticStr))]
 #[allow(clippy::enum_variant_names)]
 pub enum Error {
+    #[snafu(display("failed to merge jvm argument overrides"))]
+    MergeJvmArgumentOverrides {
+        source: stackable_operator::role_utils::Error,
+    },
+
     #[snafu(display("fragment validation failure"))]
     FragmentValidationFailure { source: ValidationError },
 
@@ -296,7 +302,7 @@ pub async fn reconcile(
         .context(ApplyConfigMapSnafu)?;
 
     let args = command_args(&resolved_product_image.product_version);
-    let sts = build_deployment(
+    let deployment = build_deployment(
         scs,
         &connect_config,
         &resolved_product_image,
@@ -305,7 +311,7 @@ pub async fn reconcile(
         args,
     )?;
     cluster_resources
-        .add(client, sts)
+        .add(client, deployment)
         .await
         .context(ApplyDeploymentSnafu)?;
 
@@ -456,7 +462,12 @@ fn build_deployment(
         });
 
     let container_env = env(
-        &jvm_args()?,
+        &jvm_args(
+            scs.spec
+                .server
+                .as_ref()
+                .map(|s| &s.product_specific_common_config),
+        )?,
         scs.spec
             .server
             .as_ref()
@@ -662,17 +673,31 @@ fn object_name(stacklet_name: &str, role: SparkConnectRole) -> String {
     }
 }
 
+// Returns the jvm arguments a user has provided merged with the operator props.
+// The JVM args are passed to spark-connect as SPARK_DAEMON_JAVA_OPTS env var
 #[allow(clippy::result_large_err)]
-fn jvm_args() -> Result<String, Error> {
-    let jvm_args = [
+fn jvm_args(user_java_config: Option<&JavaCommonConfig>) -> Result<String, Error> {
+    let jvm_args = vec![
         // TODO: fix this when the logging container is fixed
         // format!("-Dlog4j.configurationFile={VOLUME_MOUNT_PATH_LOG_CONFIG}/{LOG4J2_CONFIG_FILE}"),
         format!(
             "-Djava.security.properties={VOLUME_MOUNT_PATH_CONFIG}/{JVM_SECURITY_PROPERTIES_FILE}"
         ),
         format!("-javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar={METRICS_PORT}:/stackable/jmx/config.yaml")
     ];
-    Ok(jvm_args.join(" "))
+
+    if let Some(user_jvm_props) = user_java_config {
+        let operator_generated = JvmArgumentOverrides::new_with_only_additions(jvm_args.clone());
+        let mut user_jvm_props_copy = user_jvm_props.jvm_argument_overrides.clone();
+        user_jvm_props_copy
+            .try_merge(&operator_generated)
+            .context(MergeJvmArgumentOverridesSnafu)?;
+        Ok(user_jvm_props_copy
+            .effective_jvm_config_after_merging()
+            .join(" "))
+    } else {
+        Ok(jvm_args.join(" "))
+    }
 }
 
 #[allow(clippy::result_large_err)]

Cargo.toml

@@ -4,7 +4,7 @@ kind: TestAssert
 timeout: 900
 ---
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: spark-connect-server
 status:

crate-hashes.json

@@ -35,15 +35,14 @@ spec:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
-  #sparkConf:
-  nodes:
+  server:
+    jvmArgumentOverrides:
+      add:
+        - -Xmx800m
     config:
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
         containers:
           spark-connect:
             custom:
               configMap: spark-connect-log-config
-    roleGroups:
-      default:
-        replicas: 1