Skip to content

Commit 61c79a5

Browse files
committed
Try a different tack at reconfiguring hbase
1 parent 9a4231a commit 61c79a5

File tree

3 files changed

+56
-12
lines changed

3 files changed

+56
-12
lines changed

rust/operator-binary/src/crd/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,10 +1237,10 @@ impl Configuration for HbaseConfigFragment {
12371237
HBASE_CLUSTER_DISTRIBUTED.to_string(),
12381238
Some("true".to_string()),
12391239
);
1240-
result.insert(
1241-
HBASE_UNSAFE_REGIONSERVER_HOSTNAME_DISABLE_MASTER_REVERSEDNS.to_string(),
1242-
Some("true".to_string()),
1243-
);
1240+
// result.insert(
1241+
// HBASE_UNSAFE_REGIONSERVER_HOSTNAME_DISABLE_MASTER_REVERSEDNS.to_string(),
1242+
// Some("true".to_string()),
1243+
// );
12441244
result.insert(HBASE_ROOTDIR.to_string(), self.hbase_rootdir.clone());
12451245
}
12461246
_ => {}
@@ -1391,10 +1391,10 @@ impl Configuration for RegionServerConfigFragment {
13911391
HBASE_CLUSTER_DISTRIBUTED.to_string(),
13921392
Some("true".to_string()),
13931393
);
1394-
result.insert(
1395-
HBASE_UNSAFE_REGIONSERVER_HOSTNAME_DISABLE_MASTER_REVERSEDNS.to_string(),
1396-
Some("true".to_string()),
1397-
);
1394+
// result.insert(
1395+
// HBASE_UNSAFE_REGIONSERVER_HOSTNAME_DISABLE_MASTER_REVERSEDNS.to_string(),
1396+
// Some("true".to_string()),
1397+
// );
13981398
result.insert(HBASE_ROOTDIR.to_string(), self.hbase_rootdir.clone());
13991399
}
14001400
_ => {}

rust/operator-binary/src/hbase_controller.rs

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,13 @@ fn build_rolegroup_config_map(
588588
hbase_site_config
589589
.extend(hbase_opa_config.map_or(vec![], |config| config.hbase_site_config()));
590590

591+
// Get more useful stack traces...
592+
// The default Netty impl gives us netty garbage and nothing else
593+
hbase_site_config.insert(
594+
"hbase.rpc.client.impl".to_string(),
595+
"org.apache.hadoop.hbase.ipc.BlockingRpcClient".to_string(),
596+
);
597+
591598
match hbase_role {
592599
HbaseRole::Master => {
593600
hbase_site_config.insert(
@@ -597,7 +604,21 @@ fn build_rolegroup_config_map(
597604
hbase_site_config.insert(
598605
"hbase.listener.master.port".to_string(),
599606
"${HBASE_SERVICE_PORT}".to_string(),
600-
)
607+
);
608+
hbase_site_config.insert(
609+
"hbase.master.ipc.address".to_string(),
610+
"0.0.0.0".to_string(),
611+
);
612+
hbase_site_config
613+
.insert("hbase.master.ipc.port".to_string(), "16000".to_string());
614+
hbase_site_config.insert(
615+
"hbase.master.hostname".to_string(),
616+
"${HBASE_SERVICE_HOST}".to_string(),
617+
);
618+
hbase_site_config.insert(
619+
"hbase.master.port".to_string(),
620+
"${HBASE_SERVICE_PORT}".to_string(),
621+
);
601622
}
602623
HbaseRole::RegionServer => {
603624
hbase_site_config.insert(
@@ -607,9 +628,25 @@ fn build_rolegroup_config_map(
607628
hbase_site_config.insert(
608629
"hbase.listener.regionserver.port".to_string(),
609630
"${HBASE_SERVICE_PORT}".to_string(),
610-
)
631+
);
632+
hbase_site_config.insert(
633+
"hbase.regionserver.ipc.address".to_string(),
634+
"0.0.0.0".to_string(),
635+
);
636+
hbase_site_config.insert(
637+
"hbase.regionserver.ipc.port".to_string(),
638+
"16020".to_string(),
639+
);
640+
hbase_site_config.insert(
641+
"hbase.unsafe.regionserver.hostname".to_string(),
642+
"${HBASE_SERVICE_HOST}".to_string(),
643+
);
644+
hbase_site_config.insert(
645+
"hbase.regionserver.port".to_string(),
646+
"${HBASE_SERVICE_PORT}".to_string(),
647+
);
611648
}
612-
HbaseRole::RestServer => None,
649+
HbaseRole::RestServer => {}
613650
};
614651

615652
// configOverride come last
@@ -900,7 +937,13 @@ fn build_rolegroup_statefulset(
900937
role = role_name,
901938
domain = hbase_service_domain_name(hbase, rolegroup_ref, cluster_info)?,
902939
port = hbase.service_port(hbase_role).to_string(),
903-
port_name = hbase.ui_port_name(),
940+
port_name = match hbase_role {
941+
HbaseRole::Master => "master",
942+
HbaseRole::RegionServer => "regionserver",
943+
HbaseRole::RestServer => "restserver",
944+
}
945+
// port_name = hbase.ports(hbase_role, "").first().unwrap().1
946+
// port_name = hbase.ui_port_name(),
904947
}])
905948
.add_env_vars(merged_env)
906949
// Needed for the `containerdebug` process to log it's tracing information to.

tests/test-definition.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ dimensions:
44
values:
55
- 2.4.18
66
- 2.6.1
7+
- 2.6.1,k3d-registry:5000/sdp/hbase:2.6.1-stackable0.0.0-dev
78
# To use a custom image, add a comma and the full name after the product version
89
# - 2.6.1,oci.stackable.tech/sandbox/hbase:2.6.1-stackable0.0.0-dev
910
# - 2.4.18,oci.stackable.tech/sandbox/hbase:2.4.18-stackable0.0.0-dev

0 commit comments

Comments
 (0)