Skip to content

Commit dd793c0

Browse files
committed
cleaned up/reverted previous wip
1 parent c8a2644 commit dd793c0

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

rust/operator-binary/src/hbase_controller.rs

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -901,19 +901,12 @@ fn build_rolegroup_statefulset(
901901
.image_from_product_image(resolved_product_image)
902902
.command(command())
903903
.args(vec![formatdoc! {"
904-
{wait}
905-
{list}
906-
{update_host}
907-
{update_port}
908-
{entrypoint} {role} {domain} {port}",
909-
wait = "until [ -f /stackable/conf/hbase-site.xml ]; do sleep 1; done;".to_string(),
910-
list = "ls -al /stackable/conf/hbase-site.xml".to_string(),
911-
update_host = "sed -i 's|\\${HBASE_SERVICE_HOST}|${HBASE_SERVICE_HOST}|g' /stackable/conf/hbase-site.xml".to_string(),
912-
update_port = "sed -i 's|\\${HBASE_SERVICE_PORT}|${HBASE_SERVICE_PORT}|g' /stackable/conf/hbase-site.xml".to_string(),
904+
{entrypoint} {role} {domain} {port} {port_name}",
913905
entrypoint = "/stackable/hbase/bin/hbase-entrypoint.sh".to_string(),
914906
role = role_name,
915907
domain = hbase_service_domain_name(hbase, rolegroup_ref, cluster_info)?,
916908
port = hbase.service_port(hbase_role).to_string(),
909+
port_name = hbase.ui_port_name(),
917910
}])
918911
.add_env_vars(merged_env)
919912
// Needed for the `containerdebug` process to log it's tracing information to.
@@ -1177,16 +1170,6 @@ fn build_hbase_env_sh(
11771170
let role_specific_non_heap_jvm_args =
11781171
construct_role_specific_non_heap_jvm_args(hbase, hbase_role, role_group, product_version)
11791172
.context(ConstructJvmArgumentSnafu)?;
1180-
let port_name = &hbase.ui_port_name();
1181-
1182-
result.insert(
1183-
"HBASE_SERVICE_HOST".to_owned(),
1184-
format!("$(cat {LISTENER_VOLUME_DIR}/default-address/address)"),
1185-
);
1186-
result.insert(
1187-
"HBASE_SERVICE_PORT".to_owned(),
1188-
format!("$(cat {LISTENER_VOLUME_DIR}/default-address/ports/{port_name})"),
1189-
);
11901173

11911174
match hbase_role {
11921175
HbaseRole::Master => {

0 commit comments

Comments
 (0)