Skip to content

fix: region mover merging oversight #626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2025
Merged

fix: region mover merging oversight #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions deploy/helm/hbase-operator/crds/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,9 +688,6 @@ spec:
description: Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details.
nullable: true
type: string
hbaseOpts:
nullable: true
type: string
hbaseRootdir:
nullable: true
type: string
Expand Down Expand Up @@ -969,9 +966,6 @@ spec:
description: Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details.
nullable: true
type: string
hbaseOpts:
nullable: true
type: string
hbaseRootdir:
nullable: true
type: string
Expand Down
3 changes: 0 additions & 3 deletions rust/crd/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,6 @@ impl AnyConfigFragment {
HbaseRole::RegionServer => {
AnyConfigFragment::RegionServer(RegionServerConfigFragment {
hbase_rootdir: None,
hbase_opts: None,
resources: default_resources(role),
logging: product_logging::spec::default_logging(),
affinity: get_affinity(cluster_name, role, hdfs_discovery_cm_name),
Expand Down Expand Up @@ -666,8 +665,6 @@ impl Atomic for RegionMoverExtraCliOpts {}
pub struct RegionServerConfig {
#[serde(default, skip_serializing_if = "Option::is_none")]
pub hbase_rootdir: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub hbase_opts: Option<String>,
#[fragment_attrs(serde(default))]
pub resources: Resources<HbaseStorageConfig, NoRuntimeLimits>,
#[fragment_attrs(serde(default))]
Expand Down
3 changes: 2 additions & 1 deletion rust/operator-binary/src/config/jvm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ pub fn construct_global_jvm_args(kerberos_enabled: bool) -> String {
jvm_args.join(" ")
}

/// Arguments that go into `HBASE_OPTS`, so *not* the heap settings (which go into `HBASE_HEAPSIZE`).
/// JVM arguments that are specifically for the role (server), so will *not* be used e.g. by CLI tools.
/// Heap settings are excluded, as they go into `HBASE_HEAPSIZE`.
pub fn construct_role_specific_non_heap_jvm_args(
hbase: &HbaseCluster,
hbase_role: &HbaseRole,
Expand Down