Skip to content

Commit 54aad69

Browse files
committed
do not default in compute_files, default via product config
1 parent ef6264c commit 54aad69

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

deploy/config-spec/properties.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,14 @@ properties:
213213
type: "string"
214214
defaultValues:
215215
- fromVersion: "0.0.0"
216-
value: "${hbase.tmp.dir}/hbase"
216+
value: "/hbase"
217217
roles:
218218
- name: "master"
219-
required: false
219+
required: true # TODO: this could be false?
220220
- name: "regionserver"
221-
required: false
221+
required: true
222222
- name: "restserver"
223-
required: false
223+
required: true # TODO: this could be false?
224224
asOfVersion: "0.0.0"
225225
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."
226226

rust/crd/src/lib.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -473,15 +473,7 @@ impl Configuration for HbaseConfigFragment {
473473
HBASE_UNSAFE_REGIONSERVER_HOSTNAME_DISABLE_MASTER_REVERSEDNS.to_string(),
474474
Some("true".to_string()),
475475
);
476-
result.insert(
477-
HBASE_ROOTDIR.to_string(),
478-
Some(
479-
self.hbase_rootdir
480-
.as_deref()
481-
.unwrap_or(HBASE_ROOT_DIR_DEFAULT)
482-
.to_string(),
483-
),
484-
);
476+
result.insert(HBASE_ROOTDIR.to_string(), self.hbase_rootdir.clone());
485477
}
486478
_ => {}
487479
}

0 commit comments

Comments
 (0)