Fix pdps and orchestrator Job to support PS 97

molecule/pdmysql/orchestrator/files/my.sandbox.cn_master

@@ -12,7 +12,7 @@ socket             = /tmp/mysql_sandbox10111.sock
 user               = root
 port               = 10111
 socket             = /tmp/mysql_sandbox10111.sock
-basedir            = /usr/bin
+basedir            = /usr
 datadir            = /root/sandboxes/ci/master/data
 tmpdir             = /root/sandboxes/ci/master/tmp
 pid-file           = /root/sandboxes/ci/master/data/mysql_sandbox10111.pid
@@ -47,6 +47,6 @@ performance_schema=0
 innodb_buffer_pool_size=32M
 slave_net_timeout=2
 read_only=1
-plugin-load-add=semisync_master.so
-plugin-load-add=semisync_slave.so
-rpl_semi_sync_master_timeout=60000
+plugin-load-add=semisync_source.so
+plugin-load-add=semisync_replica.so
+rpl_semi_sync_source_timeout=60000

molecule/pdmysql/orchestrator/files/my.sandbox.cn_node1

@@ -12,7 +12,7 @@ socket             = /tmp/mysql_sandbox10112.sock
 user               = root
 port               = 10112
 socket             = /tmp/mysql_sandbox10112.sock
-basedir            = /usr/bin
+basedir            = /usr
 datadir            = /root/sandboxes/ci/node1/data
 tmpdir             = /root/sandboxes/ci/node1/tmp
 pid-file           = /root/sandboxes/ci/node1/data/mysql_sandbox10112.pid
@@ -47,6 +47,6 @@ performance_schema=0
 innodb_buffer_pool_size=32M
 slave_net_timeout=2
 read_only=1
-plugin-load-add=semisync_master.so
-plugin-load-add=semisync_slave.so
-rpl_semi_sync_master_timeout=60000
+plugin-load-add=semisync_source.so
+plugin-load-add=semisync_replica.so
+rpl_semi_sync_source_timeout=60000

molecule/pdmysql/orchestrator/files/my.sandbox.cn_node2

@@ -12,7 +12,7 @@ socket             = /tmp/mysql_sandbox10113.sock
 user               = root
 port               = 10113
 socket             = /tmp/mysql_sandbox10113.sock
-basedir            = /usr/bin
+basedir            = /usr
 datadir            = /root/sandboxes/ci/node2/data
 tmpdir             = /root/sandboxes/ci/node2/tmp
 pid-file           = /root/sandboxes/ci/node2/data/mysql_sandbox10113.pid
@@ -47,6 +47,6 @@ performance_schema=0
 innodb_buffer_pool_size=32M
 slave_net_timeout=2
 read_only=1
-plugin-load-add=semisync_master.so
-plugin-load-add=semisync_slave.so
-rpl_semi_sync_master_timeout=60000
+plugin-load-add=semisync_source.so
+plugin-load-add=semisync_replica.so
+rpl_semi_sync_source_timeout=60000

molecule/pdmysql/orchestrator/files/my.sandbox.cn_node3

@@ -12,7 +12,7 @@ socket             = /tmp/mysql_sandbox10114.sock
 user               = root
 port               = 10114
 socket             = /tmp/mysql_sandbox10114.sock
-basedir            = /usr/bin
+basedir            = /usr
 datadir            = /root/sandboxes/ci/node3/data
 tmpdir             = /root/sandboxes/ci/node3/tmp
 pid-file           = /root/sandboxes/ci/node3/data/mysql_sandbox10114.pid
@@ -47,6 +47,6 @@ performance_schema=0
 innodb_buffer_pool_size=32M
 slave_net_timeout=2
 read_only=1
-plugin-load-add=semisync_master.so
-plugin-load-add=semisync_slave.so
-rpl_semi_sync_master_timeout=60000
+plugin-load-add=semisync_source.so
+plugin-load-add=semisync_replica.so
+rpl_semi_sync_source_timeout=60000

molecule/pdmysql/orchestrator/tasks/main.yml

@@ -24,7 +24,6 @@
       packages:
       - percona-server-server
       - percona-server-test
-      - percona-server-dbg
       - percona-server-source
       - percona-server-client
       - percona-server-rocksdb
@@ -219,6 +218,28 @@
   - name: Start mysql source
     shell: "mysqld_safe --defaults-file=/root/sandboxes/ci/master/my.sandbox.cnf &"
 
+  - name: Debug MySQL startup
+    shell: |
+      echo "=== mysqld processes ==="
+      ps -ef | grep mysqld | grep -v grep || true
+
+      echo "=== listening ports ==="
+      ss -lntp | grep 10111 || true
+
+      echo "=== config ==="
+      grep -Ei 'port|socket|pid|log|datadir' /root/sandboxes/ci/master/my.sandbox.cnf || true
+
+      echo "=== error log ==="
+      find /root/sandboxes/ci/master -name "*.err" -exec cat {} \; || true
+
+      echo "=== data directory ==="
+      ls -lah /root/sandboxes/ci/master/data
+    register: mysql_debug
+    failed_when: false
+
+  - debug:
+      var: mysql_debug.stdout_lines
+
   - name: Start mysql replica1
     shell: "mysqld_safe --defaults-file=/root/sandboxes/ci/node1/my.sandbox.cnf &"
 

molecule/pdmysql/pdps/molecule/oracle-8/molecule.yml

@@ -8,7 +8,7 @@ platforms:
     region: us-west-2
     image:  ami-0c32e4ead7507bc6f
     vpc_subnet_id: subnet-0430e63d7cdbcd237
-    instance_type: t2.small
+    instance_type: t2.medium
     ssh_user: ec2-user
     root_device_name: /dev/sda1
     instance_tags:

molecule/pdmysql/pdps/molecule/rhel-8/molecule.yml

@@ -8,7 +8,7 @@ platforms:
     region: us-west-2
     image:  ami-08970fb2e5767e3b8
     vpc_subnet_id: subnet-0430e63d7cdbcd237
-    instance_type: t2.small
+    instance_type: t2.medium
     ssh_user: ec2-user
     root_device_name: /dev/sda1
     instance_tags:

molecule/pdmysql/pdps/playbooks/cleanup.yml

@@ -4,6 +4,11 @@
   become: true
   become_method: sudo
   tasks:
+    - name: Remove Percona XtraBackup packages
+      include_tasks: ../../../../tasks/remove_pxb_innovation.yml
+      vars:
+        major_release_version: "{{ lookup('env', 'VERSION').split('.')[:2] | join('') }}"
+
     - name: remove PDPS deb packages
       apt:
         name: "{{ packages }}"

molecule/pdmysql/pdps/tasks/main.yml

@@ -40,7 +40,13 @@
     command: percona-release enable-only pdps-{{ version }} {{ repo }}
     vars:
       repo: "{{ lookup('env', 'REPO') }}"
-      version: "{{ '84-lts' if '8.4' in lookup('env', 'VERSION') else '8.0' if '8.0.' in lookup('env', 'VERSION') else '8x-innovation' }}"
+      version: >-
+        {{
+          '97-lts' if '9.7' in lookup('env', 'VERSION')
+          else '9x-innovation' if '9.' in lookup('env', 'VERSION')
+          else '84-lts' if '8.4' in lookup('env', 'VERSION')
+          else '8x-innovation'
+        }}
     when: major_repo
 
   - name: check the enabled repositories
@@ -51,8 +57,8 @@
     debug:
       var: enabled_repos.stdout_lines
 
-  - name: install Percona Toolkit
-    include_tasks: ../../../tasks/install_pt.yml
+#  - name: install Percona Toolkit
+#    include_tasks: ../../../tasks/install_pt.yml
 
   - name: clean yum
     shell: |
@@ -66,84 +72,45 @@
       dnf makecache
     when: ansible_facts['distribution'] in ['RedHat','CentOS','OracleLinux','Amazon'] and ansible_facts['distribution_major_version'] | int >= 8
 
-  - name: install Percona Server deb packages
-    apt:
-      name: "{{ packages }}"
-      update_cache: yes
-      state: latest
-    vars:
-      packages:
-      - percona-server-server
-      - percona-server-test
-      - percona-server-dbg
-      - percona-server-source
-      - percona-server-client
-      - percona-server-rocksdb
-    when: ansible_os_family == "Debian"
-
-  - name: install Percona Server rpm packages with yum
-    yum:
-      name: "{{ packages }}"
-      state: latest
-      update_cache: yes
-    vars:
-      packages:
-      - percona-server-server
-      - percona-server-client
-      - percona-server-test
-      - percona-server-debuginfo
-      - percona-server-devel
-      - percona-server-rocksdb
-    when: ansible_facts['distribution'] in ['RedHat','CentOS','OracleLinux','Amazon'] and ansible_facts['distribution_major_version'] | int < 8
-
-  - name: install Percona Server rpm packages with dnf
-    dnf:
-      name: "{{ packages }}"
-      state: latest
-      update_cache: yes
-    vars:
-      packages:
-      - percona-server-server
-      - percona-server-client
-      - percona-server-test
-      - percona-server-debuginfo
-      - percona-server-devel
-      - percona-server-rocksdb
-    when: ansible_facts['distribution'] in ['RedHat','CentOS','OracleLinux','Amazon'] and ansible_facts['distribution_major_version'] | int >= 8
-
-  - name: install Percona XtraBackup {{ major_release_version }} packages
+  - name: Install Percona Server packages
+    include_tasks: >-
+      {{
+        '../../../../tasks/install_ps97.yml'
+        if '9.7' in lookup('env', 'VERSION')
+        else '../../../../tasks/install_ps84.yml'
+        if '8.4' in lookup('env', 'VERSION')
+        else '../../../../tasks/install_ps_innovation.yml'
+      }}
+
+  - name: Install Percona XtraBackup packages
     include_tasks: ../../../tasks/install_pxb_innovation.yml
     vars:
-      # For 9x innovation, PXB packages are named percona-xtrabackup-91 (not 96)
-      major_release_version: "{{ '91' if lookup('env', 'VERSION').split('.')[0] | default('0', true) | int == 9 else lookup('env', 'VERSION').split('.')[:2]|join('') }}"
-
-  - name: install proxysql new deb packages
+      major_release_version: "{{ lookup('env', 'VERSION').split('.')[:2] | join('') }}"
+
+  - name: Set ProxySQL package name
+    set_fact:
+      proxysql_package: >-
+        {{
+          'proxysql3'
+          if lookup('env', 'PROXYSQL_VERSION').startswith('3.')
+          else 'proxysql2'
+        }}
+
+  - name: Install ProxySQL deb package
     apt:
-      name: "{{ packages }}"
-      update_cache: yes
+      name: "{{ proxysql_package }}"
       state: latest
-    vars:
-      packages:
-        - proxysql2
+      update_cache: yes
     when: ansible_os_family == "Debian"
 
-  - name: install proxysql new rpm packages with yum
-    yum:
-      name: "{{ packages }}"
-      state: latest
-    vars:
-      packages:
-        - proxysql2
-    when: ansible_facts['distribution'] in ['RedHat','CentOS','OracleLinux','Amazon'] and ansible_facts['distribution_major_version'] | int < 8
-
-  - name: install proxysql new rpm packages with dnf
+  - name: Install ProxySQL rpm package with dnf
     dnf:
-      name: "{{ packages }}"
+      name: "{{ proxysql_package }}"
       state: latest
-    vars:
-      packages:
-        - proxysql2
-    when: ansible_facts['distribution'] in ['RedHat','CentOS','OracleLinux','Amazon'] and ansible_facts['distribution_major_version'] | int >= 8
+      update_cache: yes
+    when:
+      - ansible_facts['distribution'] in ['RedHat','CentOS','OracleLinux','Amazon']
+      - ansible_facts['distribution_major_version'] | int > 8
 
   #install initscripts-service manually on OL9 till DISTMYSQL-300 is fixed
   - name: install init scripts for OL9
@@ -156,12 +123,21 @@
 
   - name: start proxysql service
     command: service proxysql start
+    when:
+      - ansible_facts['distribution'] in ['RedHat','CentOS','OracleLinux','Amazon']
+      - ansible_facts['distribution_major_version'] | int > 8
 
   - name: stop proxysql service
     command: service proxysql stop
+    when:
+      - ansible_facts['distribution'] in ['RedHat','CentOS','OracleLinux','Amazon']
+      - ansible_facts['distribution_major_version'] | int > 8
 
   - name: start proxysql service
     command: service proxysql start
+    when:
+      - ansible_facts['distribution'] in ['RedHat','CentOS','OracleLinux','Amazon']
+      - ansible_facts['distribution_major_version'] | int > 8
 
   - name: install orchestrator new deb packages
     apt:
@@ -213,9 +189,8 @@
       branch: "{{ lookup('env', 'TESTING_BRANCH') }}"
       git_account: "{{ lookup('env', 'TESTING_GIT_ACCOUNT') | default('Percona-QA', true) }}"
 
-  - name: Verify telemetry version and package installation
-    command: /package-testing/check_tel_ver_pack.sh
-    when: ansible_distribution_release != "focal"
+#  - name: Verify telemetry version and package installation
+#    command: /package-testing/check_tel_ver_pack.sh
 
   - name: set root password on centos
     command: /package-testing/setpass_57.sh

molecule/pdmysql/pdps_minor_upgrade/playbooks/cleanup.yml

@@ -4,6 +4,12 @@
   become: true
   become_method: sudo
   tasks:
+
+    - name: Remove Percona XtraBackup packages
+      include_tasks: ../../../../tasks/remove_pxb_innovation.yml
+      vars:
+        major_release_version: "{{ lookup('env', 'VERSION').split('.')[:2] | join('') }}"
+
     - name: remove PDPS deb packages
       apt:
         name: "{{ packages }}"