From cf866dd62376ed0d605d7fea4eb14375bf8b0075 Mon Sep 17 00:00:00 2001 From: Chuck Levesque Date: Thu, 26 Oct 2023 06:26:04 -0400 Subject: [PATCH 1/3] Adds 7.1.9 QueueManager for postgresql In 7.1.9 QueueManager uses RDBMS. postgresql only supported in 7.1.9.0 & CHF1, Switch to back to legacy H2 included in CHF2, other db's later Signed-off-by: Chuck Levesque --- .../base/templates/configs/databases-7.1.9.j2 | 69 +++++++++++++++++++ roles/config/cluster/base/vars/main.yml | 4 +- roles/deployment/definition/defaults/main.yml | 10 +++ 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 roles/config/cluster/base/templates/configs/databases-7.1.9.j2 diff --git a/roles/config/cluster/base/templates/configs/databases-7.1.9.j2 b/roles/config/cluster/base/templates/configs/databases-7.1.9.j2 new file mode 100644 index 00000000..9f786e35 --- /dev/null +++ b/roles/config/cluster/base/templates/configs/databases-7.1.9.j2 @@ -0,0 +1,69 @@ +--- +DAS: + SERVICEWIDE: + data_analytics_studio_database_host: {{ databases.DAS.host }} + data_analytics_studio_database_type: {{ databases.DAS.type | cloudera.cluster.format_database_type }} + data_analytics_studio_database_port: {{ databases.DAS.port }} + data_analytics_studio_database_name: {{ databases.DAS.name }} + data_analytics_studio_database_username: {{ databases.DAS.user }} + data_analytics_studio_database_password: {{ databases.DAS.password }} +RANGER: + SERVICEWIDE: + ranger_database_host: {{ databases.RANGER.host }} + ranger_database_port: {{ databases.RANGER.port }} + ranger_database_type: {{ databases.RANGER.type | cloudera.cluster.format_database_type }} + ranger_database_name: {{ databases.RANGER.name }} + ranger_database_user: {{ databases.RANGER.user }} + ranger_database_password: {{ databases.RANGER.password }} +RANGER_RMS: + SERVICEWIDE: + ranger_rms_database_host: {{ databases.RANGER.host }} + ranger_rms_database_port: {{ databases.RANGER.port }} + ranger_rms_database_type: {{ databases.RANGER.type | cloudera.cluster.format_database_type }} + ranger_rms_database_name: {{ databases.RANGER.name }} + ranger_rms_database_user: {{ databases.RANGER.user }} + ranger_rms_database_password: {{ databases.RANGER.password }} +SCHEMAREGISTRY: + SERVICEWIDE: + database_host: {{ databases.SCHEMAREGISTRY.host }} + database_port: {{ databases.SCHEMAREGISTRY.port }} + database_type: {{ databases.SCHEMAREGISTRY.type | cloudera.cluster.format_database_type }} + database_name: {{ databases.SCHEMAREGISTRY.name }} + database_user: {{ databases.SCHEMAREGISTRY.user }} + database_password: {{ databases.SCHEMAREGISTRY.password }} +SQL_STREAM_BUILDER: + SERVICEWIDE: + database_host: {{ databases.SQL_STREAM_BUILDER.host }} + database_port: {{ databases.SQL_STREAM_BUILDER.port }} + database_type: {{ databases.SQL_STREAM_BUILDER.type | cloudera.cluster.format_database_type }} + database_schema: {{ databases.SQL_STREAM_BUILDER.name }} + database_user: {{ databases.SQL_STREAM_BUILDER.user }} + database_password: {{ databases.SQL_STREAM_BUILDER.password }} + MATERIALIZED_VIEW_ENGINE: + ssb.mve.datasource.url: jdbc:{{ databases.SQL_STREAM_BUILDER_MVE.type | cloudera.cluster.format_database_type }}://{{ databases.SQL_STREAM_BUILDER_MVE.host }}:{{ databases.SQL_STREAM_BUILDER_MVE.port }}/{{ databases.SQL_STREAM_BUILDER_MVE.name }} + ssb.mve.datasource.username: {{ databases.SQL_STREAM_BUILDER_MVE.user }} + ssb.mve.datasource.password: {{ databases.SQL_STREAM_BUILDER_MVE.password }} +STREAMS_MESSAGING_MANAGER: + SERVICEWIDE: + smm_database_host: {{ databases.STREAMS_MESSAGING_MANAGER.host }} + smm_database_port: {{ databases.STREAMS_MESSAGING_MANAGER.port }} + smm_database_type: {{ databases.STREAMS_MESSAGING_MANAGER.type | cloudera.cluster.format_database_type }} + smm_database_name: {{ databases.STREAMS_MESSAGING_MANAGER.name }} + smm_database_user: {{ databases.STREAMS_MESSAGING_MANAGER.user }} + smm_database_password: {{ databases.STREAMS_MESSAGING_MANAGER.password }} +QUERY_PROCESSOR: + SERVICEWIDE: + query_processor_database_host: {{ databases.QUERY_PROCESSOR.host }} + query_processor_database_port: {{ databases.QUERY_PROCESSOR.port }} + query_processor_database_type: {{ databases.QUERY_PROCESSOR.type | cloudera.cluster.format_database_type }} + query_processor_database_name: {{ databases.QUERY_PROCESSOR.name }} + query_processor_database_username: {{ databases.QUERY_PROCESSOR.user }} + query_processor_database_password: {{ databases.QUERY_PROCESSOR.password }} +QUEUE_MANAGER: + SERVICEWIDE: + queue_manager_database_host: {{ databases.QUEUE_MANAGER.host }} + queue_manager_database_port: {{ databases.QUEUE_MANAGER.port }} + queue_manager_database_type: {{ databases.QUEUE_MANAGER.type | cloudera.cluster.format_database_type }} + queue_manager_database_name: {{ databases.QUEUE_MANAGER.name }} + queue_manager_database_username: {{ databases.QUEUE_MANAGER.user }} + queue_manager_database_password: {{ databases.QUEUE_MANAGER.password }} diff --git a/roles/config/cluster/base/vars/main.yml b/roles/config/cluster/base/vars/main.yml index 72e4fbfa..846fb6ab 100644 --- a/roles/config/cluster/base/vars/main.yml +++ b/roles/config/cluster/base/vars/main.yml @@ -21,7 +21,9 @@ custom_config_templates: # Custom configurations for databases - template: configs/databases.j2 - template: configs/databases-7.1.0.j2 - condition: "{{ cloudera_runtime_version is version('7.1.0','>=') }}" + condition: "{{ cloudera_runtime_version is version('7.1.0','>=') and cloudera_runtime_version is version('7.1.9','<') }}"" + - template: configs/databases-7.1.9.j2 + condition: "{{ cloudera_runtime_version is version('7.1.9','>=') }}" # Custom configurations for Infra Solr - template: configs/infra-solr.j2 condition: "{{ 'INFRA_SOLR' in cluster.services }}" diff --git a/roles/deployment/definition/defaults/main.yml b/roles/deployment/definition/defaults/main.yml index 57715363..e82840ae 100644 --- a/roles/deployment/definition/defaults/main.yml +++ b/roles/deployment/definition/defaults/main.yml @@ -121,6 +121,16 @@ database_defaults: user: queryprocessor password: "{{ database_default_password }}" +#New in 7.1.9, postgresql only until CHF2 + QUEUE_MANAGER: + host: "{{ database_host }}" + port: "{{ database_type | cloudera.cluster.default_database_port }}" + type: postgresql + name: queuemanager + user: queuemanager + password: "{{ database_default_password }}" + + databases_cm_svcs: ACTIVITYMONITOR: host: "{{ database_host }}" From aa22bf9163bac367979cdb0d703e3754917babef Mon Sep 17 00:00:00 2001 From: Chuck Levesque Date: Mon, 6 Nov 2023 15:55:54 -0500 Subject: [PATCH 2/3] Fix typo - Adds 7.1.9 QueueManager for postgresql Fix typo on svc name - Adds 7.1.9 QueueManager for postgresql In 7.1.9 QueueManager uses RDBMS. postgresql only supported in 7.1.9.0 & CHF1, Switch to back to legacy H2 included in CHF2, other db's later Signed-off-by: Chuck Levesque --- roles/config/cluster/base/templates/configs/databases-7.1.9.j2 | 2 +- roles/deployment/definition/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/config/cluster/base/templates/configs/databases-7.1.9.j2 b/roles/config/cluster/base/templates/configs/databases-7.1.9.j2 index 9f786e35..d8da2d1d 100644 --- a/roles/config/cluster/base/templates/configs/databases-7.1.9.j2 +++ b/roles/config/cluster/base/templates/configs/databases-7.1.9.j2 @@ -59,7 +59,7 @@ QUERY_PROCESSOR: query_processor_database_name: {{ databases.QUERY_PROCESSOR.name }} query_processor_database_username: {{ databases.QUERY_PROCESSOR.user }} query_processor_database_password: {{ databases.QUERY_PROCESSOR.password }} -QUEUE_MANAGER: +QUEUEMANAGER: SERVICEWIDE: queue_manager_database_host: {{ databases.QUEUE_MANAGER.host }} queue_manager_database_port: {{ databases.QUEUE_MANAGER.port }} diff --git a/roles/deployment/definition/defaults/main.yml b/roles/deployment/definition/defaults/main.yml index e82840ae..3473c2b8 100644 --- a/roles/deployment/definition/defaults/main.yml +++ b/roles/deployment/definition/defaults/main.yml @@ -122,7 +122,7 @@ database_defaults: password: "{{ database_default_password }}" #New in 7.1.9, postgresql only until CHF2 - QUEUE_MANAGER: + QUEUEMANAGER: host: "{{ database_host }}" port: "{{ database_type | cloudera.cluster.default_database_port }}" type: postgresql From 803c79003bfa97e328e55dfdf8c90d8a0fd60776 Mon Sep 17 00:00:00 2001 From: Chuck Levesque Date: Fri, 10 Nov 2023 16:08:32 -0500 Subject: [PATCH 3/3] Fix mappings - Adds 7.1.9 QueueManager for postgresql Fix typo on svc name - Adds 7.1.9 QueueManager for postgresql In 7.1.9 QueueManager uses RDBMS. postgresql only supported in 7.1.9.0 & CHF1, Switch to back to legacy H2 included in CHF2, other db's later Signed-off-by: Chuck Levesque --- .../base/templates/configs/databases-7.1.9.j2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/config/cluster/base/templates/configs/databases-7.1.9.j2 b/roles/config/cluster/base/templates/configs/databases-7.1.9.j2 index d8da2d1d..d2c91e63 100644 --- a/roles/config/cluster/base/templates/configs/databases-7.1.9.j2 +++ b/roles/config/cluster/base/templates/configs/databases-7.1.9.j2 @@ -61,9 +61,9 @@ QUERY_PROCESSOR: query_processor_database_password: {{ databases.QUERY_PROCESSOR.password }} QUEUEMANAGER: SERVICEWIDE: - queue_manager_database_host: {{ databases.QUEUE_MANAGER.host }} - queue_manager_database_port: {{ databases.QUEUE_MANAGER.port }} - queue_manager_database_type: {{ databases.QUEUE_MANAGER.type | cloudera.cluster.format_database_type }} - queue_manager_database_name: {{ databases.QUEUE_MANAGER.name }} - queue_manager_database_username: {{ databases.QUEUE_MANAGER.user }} - queue_manager_database_password: {{ databases.QUEUE_MANAGER.password }} + queuemanager_database_host: {{ databases.QUEUEMANAGER.host }} + queuemanager_database_port: {{ databases.QUEUEMANAGER.port }} + queuemanager_database_type: {{ databases.QUEUEMANAGER.type | cloudera.cluster.format_database_type }} + queuemanager_database_name: {{ databases.QUEUEMANAGER.name }} + queuemanager_database_user: {{ databases.QUEUEMANAGER.user }} + queuemanager_database_password: {{ databases.QUEUEMANAGER.password }}