chore: Switch to new image that only contains HMS (#447)

* chore: Switch to new image that only contains HMS

* changelog

* fix HADOOP_OPTS

* Revert change of HIVE_METASTORE_HADOOP_OPTS

* Go back to HADOOP_OPTS

Author: sbernauer

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Changed
+
+- BREAKING: Switch to new image that only contains HMS.
+  For most of the users this is an internal change, but this is breaking for users of custom logging configurations as
+  the key `hive-log4j2.properties` in the ConfigMap containing the logging configuration must now be called
+  `metastore-log4j2.properties` ([#447]).
+
+[#447]: https://github.com/stackabletech/hive-operator/pull/447
+
 ## [24.3.0] - 2024-03-20
 
 ### Added

rust/crd/src/lib.rs

@@ -34,7 +34,8 @@ pub mod affinity;
 pub mod security;
 
 pub const APP_NAME: &str = "hive";
-// directories
+
+// Directories
 pub const STACKABLE_CONFIG_DIR: &str = "/stackable/config";
 pub const STACKABLE_CONFIG_DIR_NAME: &str = "config";
 pub const STACKABLE_CONFIG_MOUNT_DIR: &str = "/stackable/mount/config";
@@ -43,27 +44,31 @@ pub const STACKABLE_LOG_DIR: &str = "/stackable/log";
 pub const STACKABLE_LOG_DIR_NAME: &str = "log";
 pub const STACKABLE_LOG_CONFIG_MOUNT_DIR: &str = "/stackable/mount/log-config";
 pub const STACKABLE_LOG_CONFIG_MOUNT_DIR_NAME: &str = "log-config-mount";
-// config file names
+
+// Config file names
 pub const CORE_SITE_XML: &str = "core-site.xml";
 pub const HIVE_SITE_XML: &str = "hive-site.xml";
 pub const HIVE_ENV_SH: &str = "hive-env.sh";
-pub const HIVE_LOG4J2_PROPERTIES: &str = "hive-log4j2.properties";
+pub const HIVE_METASTORE_LOG4J2_PROPERTIES: &str = "metastore-log4j2.properties";
 pub const JVM_SECURITY_PROPERTIES_FILE: &str = "security.properties";
 
-// default ports
+// Default ports
 pub const HIVE_PORT_NAME: &str = "hive";
 pub const HIVE_PORT: u16 = 9083;
 pub const METRICS_PORT_NAME: &str = "metrics";
 pub const METRICS_PORT: u16 = 9084;
-// certificates and trust stores
+
+// Certificates and trust stores
 pub const SYSTEM_TRUST_STORE: &str = "/etc/pki/java/cacerts";
 pub const SYSTEM_TRUST_STORE_PASSWORD: &str = "changeit";
 pub const STACKABLE_TRUST_STORE: &str = "/stackable/truststore.p12";
 pub const STACKABLE_TRUST_STORE_PASSWORD: &str = "changeit";
 pub const CERTS_DIR: &str = "/stackable/certificates/";
-// metastore opts
-pub const HIVE_METASTORE_HADOOP_OPTS: &str = "HIVE_METASTORE_HADOOP_OPTS";
-// heap
+
+// Metastore opts
+pub const HADOOP_OPTS: &str = "HADOOP_OPTS";
+
+// Heap
 pub const HADOOP_HEAPSIZE: &str = "HADOOP_HEAPSIZE";
 pub const JVM_HEAP_FACTOR: f32 = 0.8;
 
@@ -441,14 +446,16 @@ impl Configuration for MetaStoreConfigFragment {
         let mut result = BTreeMap::new();
 
         let env = formatdoc! {"
-                    -javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar={METRICS_PORT}:/stackable/jmx/jmx_hive_config.yaml
-                    -Djavax.net.ssl.trustStore={STACKABLE_TRUST_STORE}
-                    -Djavax.net.ssl.trustStorePassword={STACKABLE_TRUST_STORE_PASSWORD}
-                    -Djavax.net.ssl.trustStoreType=pkcs12
-                    -Djava.security.properties={STACKABLE_CONFIG_DIR}/{JVM_SECURITY_PROPERTIES_FILE}
-                    {java_security_krb5_conf}", java_security_krb5_conf = java_security_krb5_conf(hive)};
-
-        result.insert(HIVE_METASTORE_HADOOP_OPTS.to_string(), Some(env));
+            -javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar={METRICS_PORT}:/stackable/jmx/jmx_hive_config.yaml \
+            -Djavax.net.ssl.trustStore={STACKABLE_TRUST_STORE} \
+            -Djavax.net.ssl.trustStorePassword={STACKABLE_TRUST_STORE_PASSWORD} \
+            -Djavax.net.ssl.trustStoreType=pkcs12 \
+            -Djava.security.properties={STACKABLE_CONFIG_DIR}/{JVM_SECURITY_PROPERTIES_FILE} \
+            {java_security_krb5_conf}",
+            java_security_krb5_conf = java_security_krb5_conf(hive)
+        };
+
+        result.insert(HADOOP_OPTS.to_string(), Some(env));
 
         Ok(result)
     }

rust/operator-binary/src/command.rs

@@ -1,5 +1,5 @@
 use stackable_hive_crd::{
-    HiveCluster, HIVE_LOG4J2_PROPERTIES, HIVE_SITE_XML, STACKABLE_CONFIG_DIR,
+    HiveCluster, HIVE_METASTORE_LOG4J2_PROPERTIES, HIVE_SITE_XML, STACKABLE_CONFIG_DIR,
     STACKABLE_CONFIG_MOUNT_DIR, STACKABLE_LOG_CONFIG_MOUNT_DIR, STACKABLE_TRUST_STORE,
     STACKABLE_TRUST_STORE_PASSWORD, SYSTEM_TRUST_STORE, SYSTEM_TRUST_STORE_PASSWORD,
 };
@@ -25,8 +25,8 @@ pub fn build_container_command_args(
         format!("cp -RL {STACKABLE_CONFIG_MOUNT_DIR}/* {STACKABLE_CONFIG_DIR}"),
 
         // Copy log4j2 properties
-        format!("echo copying {STACKABLE_LOG_CONFIG_MOUNT_DIR}/{HIVE_LOG4J2_PROPERTIES} to {STACKABLE_CONFIG_DIR}/{HIVE_LOG4J2_PROPERTIES}"),
-        format!("cp -RL {STACKABLE_LOG_CONFIG_MOUNT_DIR}/{HIVE_LOG4J2_PROPERTIES} {STACKABLE_CONFIG_DIR}/{HIVE_LOG4J2_PROPERTIES}"),
+        format!("echo copying {STACKABLE_LOG_CONFIG_MOUNT_DIR}/{HIVE_METASTORE_LOG4J2_PROPERTIES} to {STACKABLE_CONFIG_DIR}/{HIVE_METASTORE_LOG4J2_PROPERTIES}"),
+        format!("cp -RL {STACKABLE_LOG_CONFIG_MOUNT_DIR}/{HIVE_METASTORE_LOG4J2_PROPERTIES} {STACKABLE_CONFIG_DIR}/{HIVE_METASTORE_LOG4J2_PROPERTIES}"),
 
         // Copy system truststore to stackable truststore
         format!("keytool -importkeystore -srckeystore {SYSTEM_TRUST_STORE} -srcstoretype jks -srcstorepass {SYSTEM_TRUST_STORE_PASSWORD} -destkeystore {STACKABLE_TRUST_STORE} -deststoretype pkcs12 -deststorepass {STACKABLE_TRUST_STORE_PASSWORD} -noprompt")

rust/operator-binary/src/product_logging.rs

@@ -1,7 +1,9 @@
 use crate::controller::MAX_HIVE_LOG_FILES_SIZE;
 
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_hive_crd::{Container, HiveCluster, HIVE_LOG4J2_PROPERTIES, STACKABLE_LOG_DIR};
+use stackable_hive_crd::{
+    Container, HiveCluster, HIVE_METASTORE_LOG4J2_PROPERTIES, STACKABLE_LOG_DIR,
+};
 use stackable_operator::{
     builder::ConfigMapBuilder,
     client::Client,
@@ -87,7 +89,7 @@ pub fn extend_role_group_config_map(
     }) = logging.containers.get(&Container::Hive)
     {
         cm_builder.add_data(
-            HIVE_LOG4J2_PROPERTIES,
+            HIVE_METASTORE_LOG4J2_PROPERTIES,
             product_logging::framework::create_log4j2_config(
                 &format!(
                     "{STACKABLE_LOG_DIR}/{container}",

tests/templates/kuttl/kerberos-s3/70-install-access-hive.yaml.j2

@@ -155,22 +155,26 @@ data:
                 hive_client.create_table(table(database_name, local_test_table_name, f"/stackable/warehouse/location_{database_name}_{local_test_table_name}"))
             except AlreadyExistsException:
                 print(f"[INFO]: Table {local_test_table_name} already existed")
+            print("[DEBUG]: Fetching schema")
             schema = hive_client.get_schema(db_name=database_name, table_name=local_test_table_name)
             expected = [FieldSchema(name='id', type='string', comment='col comment')]
             if schema != expected:
                 print("[ERROR]: Received local schema " + str(schema) + " - expected schema: " + expected)
                 exit(-1)
+            print("[INFO]: Passed local access test")
 
             # S3 access
             try:
                 hive_client.create_table(table(database_name, s3_test_table_name, "s3a://hive/"))
             except AlreadyExistsException:
                 print(f"[INFO]: Table {s3_test_table_name} already existed")
+            print("[DEBUG]: Fetching schema")
             schema = hive_client.get_schema(db_name=database_name, table_name=s3_test_table_name)
             expected = [FieldSchema(name='id', type='string', comment='col comment')]
             if schema != expected:
                 print("[ERROR]: Received s3 schema " + str(schema) + " - expected schema: " + expected)
                 exit(-1)
+            print("[INFO]: Passed S3 access test")
 
             print("[SUCCESS] Test finished successfully!")
             exit(0)

tests/templates/kuttl/logging/03-install-hive.yaml.j2

@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: hive-log-config
 data:
-  hive-log4j2.properties: |
+  metastore-log4j2.properties: |
     appenders = FILE, CONSOLE
 
     appender.CONSOLE.type = Console
@@ -63,6 +63,8 @@ spec:
             containers:
               hive:
                 console:
+                  # FIXME: If we set this to DEBUG (for all occorences below), we get invalid log events in Vector
+                  # aggregator
                   level: INFO
                 file:
                   level: INFO