From 90f89ddca07a568d99f3f32478db6a0b1bd08f8f Mon Sep 17 00:00:00 2001 From: Haibin Lee Date: Sat, 11 Nov 2023 02:27:07 +0800 Subject: [PATCH] =?UTF-8?q?FIX:=20=E5=85=A8=E6=96=B0=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8A=A8=E6=80=81=E5=88=86=E7=BB=84=E7=9A=84?= =?UTF-8?q?=20bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inventories/opengauss/cluster_config.xml | 62 ++++++++++--------- inventories/opengauss/hosts.ini | 12 +--- .../opengauss/tasks/deploy/cluster_check.yml | 12 ++-- .../opengauss/tasks/deploy/runtime_groups.yml | 35 ++++++----- vagrant/Vagrantfile | 6 +- 5 files changed, 63 insertions(+), 64 deletions(-) diff --git a/inventories/opengauss/cluster_config.xml b/inventories/opengauss/cluster_config.xml index ad3066f..7964169 100644 --- a/inventories/opengauss/cluster_config.xml +++ b/inventories/opengauss/cluster_config.xml @@ -7,59 +7,59 @@ - - - - - + + + - - + + - - - - - + + - - + + @@ -67,17 +67,19 @@ - - + + - - + + + + diff --git a/inventories/opengauss/hosts.ini b/inventories/opengauss/hosts.ini index 5353de2..3a59a1e 100644 --- a/inventories/opengauss/hosts.ini +++ b/inventories/opengauss/hosts.ini @@ -1,20 +1,14 @@ ; 主机，仅设置 1 个目标机。 [opengauss_master] -192.168.56.18 +192.168.56.11 ; 备机，可设置若干个或留空。 [opengauss_follower] -; 192.168.56.13 -192.168.56.15 -192.168.56.19 +192.168.56.12 ; 级联机，可设置若干个或留空。 [opengauss_cascade] -; 192.168.56.11 -; 192.168.56.12 -192.168.56.14 -192.168.56.16 -; 192.168.56.17 +;192.168.56.13 ; 以上 3 个分组的合并组，勿动。 [opengauss:children] diff --git a/roles/opengauss/tasks/deploy/cluster_check.yml b/roles/opengauss/tasks/deploy/cluster_check.yml index 50c7f0e..f8d7909 100644 --- a/roles/opengauss/tasks/deploy/cluster_check.yml +++ b/roles/opengauss/tasks/deploy/cluster_check.yml @@ -22,6 +22,7 @@ - name: Import runtime tasks ansible.builtin.import_tasks: file: deploy/runtime_groups.yml + run_once: true - name: Import deploy tasks ansible.builtin.import_tasks: @@ -29,13 +30,14 @@ delegate_to: "{{ og_master }}" run_once: true vars: - cm_nodes: "{{ (groups['opengauss_cm'] is defined) | ternary(groups['opengauss_cm'], '') | sort }}" - dn_nodes: "{{ (groups['opengauss_dn'] is defined) | ternary(groups['opengauss_dn'], '') | sort }}" + cm_nodes: "{{ (og_all_nodes | count > 2) | ternary(og_all_nodes, '') | sort }}" + dn_nodes: "{{ groups['opengauss_dn'] | sort }}" ep_nodes: "{{ (groups['opengauss_ep'] is defined) | ternary(groups['opengauss_ep'], '') | sort }}" + og_cm_enabled: "{{ og_all_nodes | count > 2 }}" - - name: Repeat tasks - ansible.builtin.include_tasks: - file: deploy/cluster_check.yml +# - name: Repeat tasks +# ansible.builtin.include_tasks: +# file: deploy/cluster_check.yml - name: Mission aborted when: diff --git a/roles/opengauss/tasks/deploy/runtime_groups.yml b/roles/opengauss/tasks/deploy/runtime_groups.yml index d757156..514a391 100644 --- a/roles/opengauss/tasks/deploy/runtime_groups.yml +++ b/roles/opengauss/tasks/deploy/runtime_groups.yml @@ -17,6 +17,7 @@ # 如果已部署集群 - name: If deployed + when: "gs_detail is succeeded" block: # 不在集群里的 IP 加入到扩展节点分组。 - name: Create group 'opengauss_ep' @@ -70,24 +71,24 @@ vars: node_info: "{{ line | regex_replace(' {1,}', '|') | split('|') }}" -# # 如果未部署集群 -# - name: Create init data nodes list -# ansible.builtin.add_host: -# hostname: "{{ node }}" -# groups: -# - opengauss_dn -# node_ip: "{{ node }}" -# node_name: "og{{ node | ipaddr('int') }}" -# loop: "{{ groups['opengauss'] }}" -# loop_control: -# loop_var: node -# extended: true -# when: "gs_detail.stdout_lines is falsy" +# 如果未部署集群 +- name: Create init data nodes list + ansible.builtin.add_host: + hostname: "{{ node }}" + groups: + - opengauss_dn + node_ip: "{{ node }}" + node_name: "og{{ node | ipaddr('int') }}" + loop: "{{ groups['opengauss'] }}" + loop_control: + loop_var: node + extended: true + when: "gs_detail is failed" -# - name: Current data nodes -# ansible.builtin.debug: -# msg: "{{ groups['opengauss_dn'] }}" -# when: "groups['opengauss_dn'] is defined" +- name: Current data nodes + ansible.builtin.debug: + msg: "{{ groups['opengauss_dn'] }}" + when: "groups['opengauss_dn'] is defined" # # 如果未部署 CM 且为单节点 # - name: Create groups for CM deploy | Single node mode diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index 6977b6f..baa5716 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -13,8 +13,8 @@ Vagrant.configure("2") do |config| config.vm.guest = "centos" config.vm.provider "virtualbox" do |vb| - vb.memory = 4096 - vb.cpus = 4 + vb.memory = 1024 * 16 + vb.cpus = 8 vb.customize [ "modifyvm", :id, "--uartmode1", "disconnected" ] vb.linked_clone = true vb.check_guest_additions = false @@ -31,7 +31,7 @@ Vagrant.configure("2") do |config| config.vm.synced_folder ".", "/vagrant", disabled: true # How many vm do you want? - N = 9 + N = 3 (1..N).each do |i| config.vm.define "opengauss#{i}" do |node| -- Gitee