Merge remote-tracking branch 'origin/expert-mode' into expert-mode

Author: Rainbrand

automation/playbooks/remove_cluster.yml

@@ -29,7 +29,7 @@
             default_postgresql_cluster_name: "{{ 'main' if ansible_os_family == 'Debian' else 'data' }}"
             default_postgresql_data_dir: "\
               {% if cloud_provider | default('') | length > 0 %}\
-              {{ pg_data_mount_path | default('/pgdata') }}/{{ default_postgresql_version }}/{{ default_postgresql_cluster_name }}\
+              {{ postgresql_data_dir_mount_path | default('/pgdata') }}/{{ default_postgresql_version }}/{{ default_postgresql_cluster_name }}\
               {% else %}\
               {{ default_postgresql_home_dir }}/{{ default_postgresql_version }}/{{ default_postgresql_cluster_name }}\
               {% endif %}"

automation/playbooks/remove_node.yml

@@ -89,7 +89,7 @@
             default_postgresql_cluster_name: "{{ 'main' if ansible_os_family == 'Debian' else 'data' }}"
             default_postgresql_data_dir: "\
               {% if cloud_provider | default('') | length > 0 %}\
-              {{ pg_data_mount_path | default('/pgdata') }}/{{ default_postgresql_version }}/{{ default_postgresql_cluster_name }}\
+              {{ postgresql_data_dir_mount_path | default('/pgdata') }}/{{ default_postgresql_version }}/{{ default_postgresql_cluster_name }}\
               {% else %}\
               {{ default_postgresql_home_dir }}/{{ default_postgresql_version }}/{{ default_postgresql_cluster_name }}\
               {% endif %}"

automation/roles/cloud_resources/tasks/aws.yml

@@ -351,6 +351,25 @@
           register: ec2_spot_request_result
           when: item.instances[0] | default('') | length < 1
 
+        - name: "AWS: Wait for EC2 Spot instance to be created"
+          amazon.aws.ec2_instance:
+            access_key: "{{ lookup('ansible.builtin.env', 'AWS_ACCESS_KEY_ID') }}"
+            secret_key: "{{ lookup('ansible.builtin.env', 'AWS_SECRET_ACCESS_KEY') }}"
+            region: "{{ server_location }}"
+            filters:
+              spot-instance-request-id: "{{ item.spot_request.spot_instance_request_id }}"
+          loop: "{{ ec2_spot_request_result.results }}"
+          loop_control:
+            index_var: idx
+            label: "{{ server_name | lower }}{{ '%02d' % (idx + 1) }}"
+          register: ec2_spot_instance_wait_result
+          until:
+            - ec2_spot_instance_wait_result.instances[0][ip_address_type] is defined
+            - ec2_spot_instance_wait_result.instances[0][ip_address_type] | length > 0
+          retries: 12
+          delay: 10
+          when: item.spot_request.spot_instance_request_id is defined
+
         - name: "AWS: Rename the EC2 Spot instance"
           amazon.aws.ec2_instance:
             access_key: "{{ lookup('ansible.builtin.env', 'AWS_ACCESS_KEY_ID') }}"
@@ -364,9 +383,7 @@
             index_var: idx
             label: "{{ server_name | lower }}{{ '%02d' % (idx + 1) }}"
           register: ec2_spot_instance_result
-          until:
-            - ec2_spot_instance_result.instances[0][ip_address_type] is defined
-            - ec2_spot_instance_result.instances[0][ip_address_type] | length > 0
+          until: ec2_spot_instance_result is success
           retries: 3
           delay: 10
           when: item.spot_request.spot_instance_request_id is defined

automation/roles/common/defaults/main.yml

@@ -259,7 +259,7 @@ postgresql_home_dir: "{{ '/var/lib/postgresql' if ansible_os_family == 'Debian'
 # You can specify custom data dir path. Example: "/pgdata/{{ postgresql_version }}/main"
 postgresql_data_dir: "\
   {% if cloud_provider | default('') | length > 0 %}\
-  {{ pg_data_mount_path | default('/pgdata') }}/{{ postgresql_version }}/{{ postgresql_cluster_name }}\
+  {{ postgresql_data_dir_mount_path | default('/pgdata') }}/{{ postgresql_version }}/{{ postgresql_cluster_name }}\
   {% else %}\
   {{ postgresql_home_dir }}/{{ postgresql_version }}/{{ postgresql_cluster_name }}\
   {% endif %}"

automation/roles/mount/README.md

@@ -14,8 +14,8 @@ This role configures filesystems and mount points:
 | mount[].fstype | "ext4" | Filesystem type (e.q., ext4, xfs). Use "zfs" to create a zpool and mount it. |
 | mount[].opts | "defaults,noatime" | Mount options (not applicable to zfs creation). |
 | mount[].state | "mounted" | Desired state (mounted, present, absent, etc.). |
-| pg_data_mount_path | "/pgdata" | Default path used when auto-provisioning or for the ZFS mountpoint. |
-| pg_data_mount_fstype | "ext4" | Filesystem type to create when auto-provisioning the first disk. Set to "zfs" to create a zpool. |
+| postgresql_data_dir_mount_path | "/pgdata" | Default path used when auto-provisioning or for the ZFS mountpoint. |
+| postgresql_data_dir_mount_fstype | "ext4" | Filesystem type to create when auto-provisioning the first disk. Set to "zfs" to create a zpool. |
 
 Notes:
 - The role relies on lsblk and jq for disk detection; ensure jq is available (it is installed by the common role by default).

automation/roles/mount/tasks/main.yml

@@ -26,14 +26,14 @@
       when: lsblk_disk.stdout is defined and lsblk_disk.stdout | length < 1
 
     # Filesystem
-    - name: Create "{{ pg_data_mount_fstype | default('ext4') }}" filesystem on the disk "/dev/{{ lsblk_disk.stdout | default('') }}"
+    - name: Create "{{ postgresql_data_dir_mount_fstype | default('ext4') }}" filesystem on the disk "/dev/{{ lsblk_disk.stdout | default('') }}"
       community.general.filesystem:
         dev: "/dev/{{ lsblk_disk.stdout }}"
-        fstype: "{{ pg_data_mount_fstype | default('ext4') }}"
+        fstype: "{{ postgresql_data_dir_mount_fstype | default('ext4') }}"
       when:
         - (lsblk_disk.stdout is defined and lsblk_disk.stdout | length > 0)
-        - ((pg_data_mount_fstype is defined and pg_data_mount_fstype != 'zfs') or
-          (pg_data_mount_fstype is not defined and mount[0].fstype != 'zfs'))
+        - ((postgresql_data_dir_mount_fstype is defined and postgresql_data_dir_mount_fstype != 'zfs') or
+          (postgresql_data_dir_mount_fstype is not defined and mount[0].fstype != 'zfs'))
 
     # UUID
     - name: Get UUID of the disk "/dev/{{ lsblk_disk.stdout | default('') }}"
@@ -46,30 +46,30 @@
       changed_when: false
       when:
         - (lsblk_disk.stdout is defined and lsblk_disk.stdout | length > 0)
-        - ((pg_data_mount_fstype is defined and pg_data_mount_fstype != 'zfs') or
-          (pg_data_mount_fstype is not defined and mount[0].fstype != 'zfs'))
+        - ((postgresql_data_dir_mount_fstype is defined and postgresql_data_dir_mount_fstype != 'zfs') or
+          (postgresql_data_dir_mount_fstype is not defined and mount[0].fstype != 'zfs'))
 
     - name: "Set mount variables"
       ansible.builtin.set_fact:
         mount:
           - src: "UUID={{ lsblk_uuid.stdout }}"
-            path: "{{ pg_data_mount_path | default('/pgdata', true) }}"
-            fstype: "{{ pg_data_mount_fstype | default('ext4', true) }}"
+            path: "{{ postgresql_data_dir_mount_path | default('/pgdata', true) }}"
+            fstype: "{{ postgresql_data_dir_mount_fstype | default('ext4', true) }}"
       when: lsblk_uuid.stdout is defined
 
     # Mount
     - name: Mount the filesystem
       ansible.posix.mount:
         path: "{{ item.path }}"
         src: "{{ item.src }}"
-        fstype: "{{ item.fstype | default(pg_data_mount_fstype | default('ext4', true), true) }}"
+        fstype: "{{ item.fstype | default(postgresql_data_dir_mount_fstype | default('ext4', true), true) }}"
         opts: "{{ item.opts | default('defaults,noatime') }}"
         state: "{{ item.state | default('mounted') }}"
       loop: "{{ mount }}"
       when:
         - (item.src | length > 0 and item.path | length > 0)
-        - ((pg_data_mount_fstype is defined and pg_data_mount_fstype != 'zfs') or
-          (pg_data_mount_fstype is not defined and item.fstype != 'zfs'))
+        - ((postgresql_data_dir_mount_fstype is defined and postgresql_data_dir_mount_fstype != 'zfs') or
+          (postgresql_data_dir_mount_fstype is not defined and item.fstype != 'zfs'))
 
     # ZFS Pool (if fstype is 'zfs')
     - block:
@@ -150,10 +150,10 @@
             -O atime=off
             -O recordsize=128k
             -O logbias=throughput
-            -m {{ pg_data_mount_path | default(mount[0].path | default('/pgdata', true), true) }}
+            -m {{ postgresql_data_dir_mount_path | default(mount[0].path | default('/pgdata', true), true) }}
             pgdata {{ mount[0].src | default("/dev/" + lsblk_disk.stdout, true) }}
       when:
         - (mount[0].src | length > 0 or lsblk_disk.stdout | default('') | length > 0)
-        - ((pg_data_mount_fstype is defined and pg_data_mount_fstype == 'zfs') or
-          (pg_data_mount_fstype is not defined and mount[0].fstype == 'zfs'))
+        - ((postgresql_data_dir_mount_fstype is defined and postgresql_data_dir_mount_fstype == 'zfs') or
+          (postgresql_data_dir_mount_fstype is not defined and mount[0].fstype == 'zfs'))
   tags: mount, zpool

automation/roles/pgbouncer/templates/pgbouncer.ini.j2

@@ -1,6 +1,14 @@
 [databases]
 {% for pool in pgbouncer_pools %}
-{{ pool.name }} = host={{ postgresql_unix_socket_dir }} port={{ postgresql_port }} dbname={{ pool.dbname }} {% if pool.pool_parameters is string %}{{ pool.pool_parameters }}{% elif pool.pool_parameters is mapping %}{% for k, v in pool.pool_parameters.items() %}{{ k }}={{ v }} {% endfor %}{% endif %}
+{%   set params = [] %}
+{%   if pool.pool_parameters is string %}
+{%     set _ = params.append(pool.pool_parameters) %}
+{%   elif pool.pool_parameters is mapping %}
+{%     for k, v in pool.pool_parameters.items() %}
+{%       set _ = params.append(k ~ '=' ~ v) %}
+{%     endfor %}
+{%   endif %}
+{{ pool.name }} = host={{ postgresql_unix_socket_dir }} port={{ postgresql_port }} dbname={{ pool.dbname }} {{ params | join(' ') }}
 {% endfor %}
 
 * = host={{ postgresql_unix_socket_dir }} port={{ postgresql_port }}

automation/roles/postgresql_users/tasks/main.yml

@@ -6,7 +6,7 @@
     name: "{{ item.name }}"
     password: "{{ item.password | default(omit) }}"
     encrypted: true
-    role_attr_flags: "{{ item.flags }}"
+    role_attr_flags: "{{ item.flags | default('LOGIN') }}"
     login_host: "127.0.0.1"
     login_port: "{{ postgresql_port }}"
     login_user: "{{ patroni_superuser_username }}"

console/service/internal/controllers/cluster/post_cluster.go

@@ -368,24 +368,23 @@ func getIntValFromExtraVars(m map[string]interface{}, key string) int {
 	if !ok || v == nil {
 		return 0
 	}
-	switch t := v.(type) {
-	case float64:
-		return int(t)
-	case int:
-		return t
-	case int32:
-		return int(t)
-	case int64:
-		return int(t)
-	case string:
-		n, err := strconv.Atoi(t)
-		if err != nil {
-			return 0
-		}
+
+	if num, ok := v.(json.Number); ok {
+		n, _ := strconv.Atoi(num.String())
 		return n
-	default:
-		return 0
 	}
+
+	if f, ok := v.(float64); ok {
+		return int(f)
+	}
+
+	s := fmt.Sprintf("%v", v)
+
+	if fl, err := strconv.ParseFloat(s, 64); err == nil {
+		return int(fl)
+	}
+
+	return 0
 }
 
 type InventoryJson struct {

console/ui/src/shared/lib/clusterValuesTransformFunctions.ts

@@ -70,7 +70,7 @@ export const getCloudProviderExtraVars = (values: ClusterFormValues) => ({
   ...values[CLUSTER_FORM_FIELD_NAMES.REGION_CONFIG].cloud_image.image,
   ...(IS_EXPERT_MODE
     ? {
-        pg_data_mount_fstype: values[STORAGE_BLOCK_FIELDS.FILE_SYSTEM_TYPE],
+        postgresql_data_dir_mount_fstype: values[STORAGE_BLOCK_FIELDS.FILE_SYSTEM_TYPE],
         volume_type: values[STORAGE_BLOCK_FIELDS.VOLUME_TYPE],
         database_public_access: !!values?.[ADDITIONAL_SETTINGS_BLOCK_FIELD_NAMES.IS_DB_PUBLIC_ACCESS],
         cloud_load_balancer: !!values?.[ADDITIONAL_SETTINGS_BLOCK_FIELD_NAMES.IS_CLOUD_LOAD_BALANCER],