add RUN_REGION_MOVER env var

stackabletech · Oct 17, 2024 · 2b6e89b · 2b6e89b
1 parent 43abf6d
commit 2b6e89b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs
@@ -1175,6 +1175,13 @@ impl AnyServiceConfig {
             _ => "".to_string(),
         }
     }
+
+    pub fn run_region_mover(&self) -> bool {
+        match self {
+            AnyServiceConfig::RegionServer(config) => config.region_mover.run_before_shutdown,
+            _ => false,
+        }
+    }
 }
 
 #[cfg(test)]

diff --git a/rust/operator-binary/src/hbase_controller.rs b/rust/operator-binary/src/hbase_controller.rs
@@ -807,11 +807,18 @@ fn build_rolegroup_statefulset(
 
     let mut merged_env = merged_env(rolegroup_config.get(&PropertyNameKind::Env));
     // This env var is set for all roles to avoid bash's "unbound variable" errors
-    merged_env.push(EnvVar {
-        name: "REGION_MOVER_OPTS".to_string(),
-        value: Some(config.region_mover_args()),
-        ..EnvVar::default()
-    });
+    merged_env.extend([
+        EnvVar {
+            name: "REGION_MOVER_OPTS".to_string(),
+            value: Some(config.region_mover_args()),
+            ..EnvVar::default()
+        },
+        EnvVar {
+            name: "RUN_REGION_MOVER".to_string(),
+            value: Some(config.run_region_mover().to_string()),
+            ..EnvVar::default()
+        },
+    ]);
 
     let mut hbase_container = ContainerBuilder::new("hbase").expect("ContainerBuilder not created");
     hbase_container