do not default in compute_files, default via product config

stackabletech · Nov 13, 2024 · 54aad69 · 54aad69
1 parent ef6264c
commit 54aad69
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git 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
@@ -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());
             }
             _ => {}
         }