From 54df9af7f50459b3236382b0d0fe07180915e733 Mon Sep 17 00:00:00 2001 From: Tristan Stevens Date: Tue, 22 Mar 2022 17:12:26 +0000 Subject: [PATCH 1/2] Add Ozone data directories Signed-off-by: Tristan Stevens --- .../base/templates/configs/defaults.j2 | 21 +++++++++++++++++++ roles/teardown/vars/main.yml | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/roles/config/cluster/base/templates/configs/defaults.j2 b/roles/config/cluster/base/templates/configs/defaults.j2 index a8637fa0..a962b4d4 100644 --- a/roles/config/cluster/base/templates/configs/defaults.j2 +++ b/roles/config/cluster/base/templates/configs/defaults.j2 @@ -18,6 +18,27 @@ KUDU: KUDU_TSERVER: fs_data_dirs: /kudu/tablet/data fs_wal_dir: /kudu/tablet/wal +OZONE: + OZONE_DATANODE: + ozone.scm.datanode.id.dir: /var/lib/hadoop-ozone/datanode + dfs.container.ratis.datanode.storage.dir: /var/lib/hadoop-ozone/datanode/ratis/data + hdds.datanode.dir: /var/lib/hadoop-ozone/datanode/data + ozone.metadata.dirs: /var/lib/hadoop-ozone/datanode/ozone-metadata + OZONE_MANAGER: + ozone.om.db.dirs: /var/lib/hadoop-ozone/datanode/ozone-metadata + ozone.metadata.dirs: /var/lib/hadoop-ozone/om/ozone-metadata + ozone.om.ratis.storage.dir: /var/lib/hadoop-ozone/om/ratis + OZONE_PROMETHEUS: + ozone.prometheus.db.dir: /var/lib/hadoop-ozone/prometheus/data + OZONE_RECON: + ozone.recon.db.dir: /var/lib/hadoop-ozone/recon/data + ozone.recon.scm.db.dirs: /var/lib/hadoop-ozone/recon/scm/data + ozone.recon.om.db.dir: /var/lib/hadoop-ozone/recon/om/data + ozone.metadata.dirs: /var/lib/hadoop-ozone/recon/ozone-metadata +STORAGE_CONTAINER_MANAGER: + - ozone.scm.db.dirs: /var/lib/hadoop-ozone/scm/data + - ozone.metadata.dirs: /var/lib/hadoop-ozone/scm/ozone-metadata + - ozone.scm.ha.ratis.storage.dir: /var/lib/hadoop-ozone/scm/ratis YARN: NODEMANAGER: yarn_nodemanager_local_dirs: /yarn/nm diff --git a/roles/teardown/vars/main.yml b/roles/teardown/vars/main.yml index 8f120971..29c9008c 100644 --- a/roles/teardown/vars/main.yml +++ b/roles/teardown/vars/main.yml @@ -57,6 +57,27 @@ base_cluster_directories: - fs_data_dirs - fs_wal_dir - log_dir + OZONE: + OZONE_DATANODE: + - ozone.scm.datanode.id.dir + - dfs.container.ratis.datanode.storage.dir + - hdds.datanode.dir + - ozone.metadata.dirs + OZONE_MANAGER: + - ozone.om.db.dirs + - ozone.metadata.dirs + - ozone.om.ratis.storage.dir + OZONE_PROMETHEUS: + - ozone.prometheus.db.dir + OZONE_RECON: + - ozone.recon.db.dir + - ozone.recon.scm.db.dirs + - ozone.recon.om.db.dir + - ozone.metadata.dirs + STORAGE_CONTAINER_MANAGER: + - ozone.scm.db.dirs + - ozone.metadata.dirs + - ozone.scm.ha.ratis.storage.dir YARN: SERVICEWIDE: - ranger_audit_hdfs_spool_dir From ff6edc6655b1eebce9ac9c3af03cdf02d8c87ea5 Mon Sep 17 00:00:00 2001 From: Tristan Stevens Date: Tue, 22 Mar 2022 18:09:24 +0000 Subject: [PATCH 2/2] Add Ozone data directories Signed-off-by: Tristan Stevens --- roles/config/cluster/base/templates/configs/defaults.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/config/cluster/base/templates/configs/defaults.j2 b/roles/config/cluster/base/templates/configs/defaults.j2 index a962b4d4..ff7809bd 100644 --- a/roles/config/cluster/base/templates/configs/defaults.j2 +++ b/roles/config/cluster/base/templates/configs/defaults.j2 @@ -35,10 +35,10 @@ OZONE: ozone.recon.scm.db.dirs: /var/lib/hadoop-ozone/recon/scm/data ozone.recon.om.db.dir: /var/lib/hadoop-ozone/recon/om/data ozone.metadata.dirs: /var/lib/hadoop-ozone/recon/ozone-metadata -STORAGE_CONTAINER_MANAGER: - - ozone.scm.db.dirs: /var/lib/hadoop-ozone/scm/data - - ozone.metadata.dirs: /var/lib/hadoop-ozone/scm/ozone-metadata - - ozone.scm.ha.ratis.storage.dir: /var/lib/hadoop-ozone/scm/ratis + STORAGE_CONTAINER_MANAGER: + ozone.scm.db.dirs: /var/lib/hadoop-ozone/scm/data + ozone.metadata.dirs: /var/lib/hadoop-ozone/scm/ozone-metadata + ozone.scm.ha.ratis.storage.dir: /var/lib/hadoop-ozone/scm/ratis YARN: NODEMANAGER: yarn_nodemanager_local_dirs: /yarn/nm