From 54aad69c3bb05efa4099b5e6197f4e645c9ff6c0 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Wed, 13 Nov 2024 15:39:20 +0100 Subject: [PATCH] do not default in compute_files, default via product config --- deploy/config-spec/properties.yaml | 8 ++++---- rust/crd/src/lib.rs | 10 +--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/deploy/config-spec/properties.yaml b/deploy/config-spec/properties.yaml index 2dc4b619..7ac88e53 100644 --- a/deploy/config-spec/properties.yaml +++ b/deploy/config-spec/properties.yaml @@ -213,14 +213,14 @@ properties: type: "string" defaultValues: - fromVersion: "0.0.0" - value: "${hbase.tmp.dir}/hbase" + value: "/hbase" roles: - name: "master" - required: false + required: true # TODO: this could be false? - name: "regionserver" - required: false + required: true - name: "restserver" - required: false + required: true # TODO: this could be false? asOfVersion: "0.0.0" description: "The directory shared by region servers and into which HBase persists. The URL should be 'fully-qualified' to include the filesystem scheme. For example, to specify the HDFS directory '/hbase' where the HDFS instance's namenode is running at namenode.example.org on port 9000, set this value to: hdfs://namenode.example.org:9000/hbase. By default, we write to whatever ${hbase.tmp.dir} is set too -- usually /tmp -- so change this configuration or else all data will be lost on machine restart." diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index 43572e26..8c1c4685 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -473,15 +473,7 @@ impl Configuration for HbaseConfigFragment { HBASE_UNSAFE_REGIONSERVER_HOSTNAME_DISABLE_MASTER_REVERSEDNS.to_string(), Some("true".to_string()), ); - result.insert( - HBASE_ROOTDIR.to_string(), - Some( - self.hbase_rootdir - .as_deref() - .unwrap_or(HBASE_ROOT_DIR_DEFAULT) - .to_string(), - ), - ); + result.insert(HBASE_ROOTDIR.to_string(), self.hbase_rootdir.clone()); } _ => {} }