[Merged by Bors] - Increase the size limit of the log volume

CHANGELOG.md

@@ -11,9 +11,13 @@ All notable changes to this project will be documented in this file.
 - Set explicit resources on all container ([#345], [#347])
 - Support podOverrides ([#352])
 
+### Fixed
+
+- Increase the size limit of the log volume ([#354]).
+
 ### Changed
 
-- Operator-rs: `0.40.2` -> `0.41.0` ([#336]).
+- Operator-rs: `0.40.2` -> `0.44.0` ([#336], [#354]).
 - Use 0.0.0-dev product images for testing ([#337])
 - Use testing-tools 0.2.0 ([#337])
 - Added kuttl test suites ([#348])
@@ -26,6 +30,7 @@ All notable changes to this project will be documented in this file.
 [#347]: https://github.com/stackabletech/hive-operator/pull/347
 [#348]: https://github.com/stackabletech/hive-operator/pull/348
 [#352]: https://github.com/stackabletech/hive-operator/pull/352
+[#354]: https://github.com/stackabletech/hive-operator/pull/354
 
 ## [23.4.0] - 2023-04-17
 

rust/crd/Cargo.toml

@@ -13,7 +13,7 @@ indoc = "1.0.8"
 serde = "1.0"
 serde_json = "1.0"
 snafu = "0.7"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.42.2" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.44.0" }
 strum = { version = "0.24", features = ["derive"] }
 tracing = "0.1"
 

rust/operator-binary/Cargo.toml

@@ -19,12 +19,12 @@ serde = "1.0"
 serde_json = "1.0"
 snafu = "0.7"
 stackable-hive-crd = { path = "../crd" }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.42.2" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.44.0" }
 strum = { version = "0.24", features = ["derive"] }
 tokio = { version = "1.23", features = ["full"] }
 tracing = "0.1"
 
 [build-dependencies]
 built = { version =  "0.5", features = ["chrono", "git2"] }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.42.2" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.44.0" }
 stackable-hive-crd = { path = "../crd" }

rust/operator-binary/src/controller.rs

@@ -75,11 +75,10 @@ pub const HIVE_UID: i64 = 1000;
 pub const HIVE_CONTROLLER_NAME: &str = "hivecluster";
 const DOCKER_IMAGE_BASE_NAME: &str = "hive";
 
-pub const MAX_HIVE_LOG_FILES_SIZE_IN_MIB: u32 = 10;
-
-const OVERFLOW_BUFFER_ON_LOG_VOLUME_IN_MIB: u32 = 1;
-const LOG_VOLUME_SIZE_IN_MIB: u32 =
-    MAX_HIVE_LOG_FILES_SIZE_IN_MIB + OVERFLOW_BUFFER_ON_LOG_VOLUME_IN_MIB;
+pub const MAX_HIVE_LOG_FILES_SIZE: MemoryQuantity = MemoryQuantity {
+    value: 10.0,
+    unit: BinaryMultiple::Mebi,
+};
 
 pub struct Ctx {
     pub client: stackable_operator::client::Client,
@@ -625,6 +624,7 @@ fn build_rolegroup_service(
 ///
 /// The [`Pod`](`stackable_operator::k8s_openapi::api::core::v1::Pod`)s are accessible through the
 /// corresponding [`Service`] (from [`build_rolegroup_service`]).
+#[allow(clippy::too_many_arguments)]
 fn build_metastore_rolegroup_statefulset(
     hive: &HiveCluster,
     hive_role: &HiveRole,
@@ -803,14 +803,12 @@ fn build_metastore_rolegroup_statefulset(
             }),
             ..Default::default()
         })
-        .add_volume(Volume {
-            name: STACKABLE_LOG_DIR_NAME.to_string(),
-            empty_dir: Some(EmptyDirVolumeSource {
-                medium: None,
-                size_limit: Some(Quantity(format!("{LOG_VOLUME_SIZE_IN_MIB}Mi"))),
-            }),
-            ..Volume::default()
-        })
+        .add_empty_dir_volume(
+            STACKABLE_LOG_DIR_NAME,
+            Some(product_logging::framework::calculate_log_volume_size_limit(
+                &[MAX_HIVE_LOG_FILES_SIZE],
+            )),
+        )
         .affinity(&merged_config.affinity)
         .service_account_name(sa_name)
         .security_context(

rust/operator-binary/src/product_logging.rs

@@ -1,4 +1,4 @@
-use crate::controller::MAX_HIVE_LOG_FILES_SIZE_IN_MIB;
+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};
@@ -7,6 +7,7 @@ use stackable_operator::{
     client::Client,
     k8s_openapi::api::core::v1::ConfigMap,
     kube::ResourceExt,
+    memory::BinaryMultiple,
     product_logging::{
         self,
         spec::{ContainerLogConfig, ContainerLogConfigChoice, Logging},
@@ -94,7 +95,10 @@ pub fn extend_role_group_config_map(
                     container = Container::Hive
                 ),
                 HIVE_LOG_FILE,
-                MAX_HIVE_LOG_FILES_SIZE_IN_MIB,
+                MAX_HIVE_LOG_FILES_SIZE
+                    .scale_to(BinaryMultiple::Mebi)
+                    .floor()
+                    .value as u32,
                 CONSOLE_CONVERSION_PATTERN,
                 log_config,
             ),