Skip to content

Commit 2b6e89b

Browse files
committed
add RUN_REGION_MOVER env var
1 parent 43abf6d commit 2b6e89b

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

rust/crd/src/lib.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,13 @@ impl AnyServiceConfig {
11751175
_ => "".to_string(),
11761176
}
11771177
}
1178+
1179+
pub fn run_region_mover(&self) -> bool {
1180+
match self {
1181+
AnyServiceConfig::RegionServer(config) => config.region_mover.run_before_shutdown,
1182+
_ => false,
1183+
}
1184+
}
11781185
}
11791186

11801187
#[cfg(test)]

rust/operator-binary/src/hbase_controller.rs

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -807,11 +807,18 @@ fn build_rolegroup_statefulset(
807807

808808
let mut merged_env = merged_env(rolegroup_config.get(&PropertyNameKind::Env));
809809
// This env var is set for all roles to avoid bash's "unbound variable" errors
810-
merged_env.push(EnvVar {
811-
name: "REGION_MOVER_OPTS".to_string(),
812-
value: Some(config.region_mover_args()),
813-
..EnvVar::default()
814-
});
810+
merged_env.extend([
811+
EnvVar {
812+
name: "REGION_MOVER_OPTS".to_string(),
813+
value: Some(config.region_mover_args()),
814+
..EnvVar::default()
815+
},
816+
EnvVar {
817+
name: "RUN_REGION_MOVER".to_string(),
818+
value: Some(config.run_region_mover().to_string()),
819+
..EnvVar::default()
820+
},
821+
]);
815822

816823
let mut hbase_container = ContainerBuilder::new("hbase").expect("ContainerBuilder not created");
817824
hbase_container

0 commit comments

Comments
 (0)