PMM-12221 User isn't logged out during upgrade anymore.

percona · Aug 24, 2023 · cad52d2 · cad52d2
1 parent a54b688
commit cad52d2
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 74 deletions.
diff --git a/update/ansible/playbook/tasks/files/maintenance.html b/update/ansible/playbook/tasks/files/maintenance.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Maintenance Mode</title>
+</head>
+<body>
+<h1>We're Currently upgrading PMM</h1>
+<p>We apologize for the inconvenience. Please check back later.</p>
+</body>
+</html>
diff --git a/update/ansible/playbook/tasks/init.yml b/update/ansible/playbook/tasks/init.yml
@@ -4,6 +4,6 @@
   become: true
   gather_facts: true
   tasks:
-    - name: Run initializaion role
+    - name: Run initialization role
       include_role:
         name: initialization
diff --git a/update/ansible/playbook/tasks/roles/initialization/tasks/main.yml b/update/ansible/playbook/tasks/roles/initialization/tasks/main.yml
@@ -86,6 +86,15 @@
     state: present
   when: not ansible_check_mode
 
+- name: Create working directory for Alertmanager
+  file: path=/srv/alertmanager/data state=directory owner=pmm group=pmm
+
+- name: Create working directory for VictoriaMetrics
+  file: path=/srv/victoriametrics/data state=directory owner=pmm group=pmm
+
+- name: Create empty configuration file for VictoriaMetrics
+  file: path=/etc/victoriametrics-promscrape.yml state=touch owner=pmm group=pmm
+
 - name: Run SQLite -> Postgres only for docker upgrade
   block:
     - name: Check that the SQLite grafana database exists

diff --git a/update/ansible/playbook/tasks/roles/nginx/files/conf.d/pmm.conf b/update/ansible/playbook/tasks/roles/nginx/files/conf.d/pmm.conf
@@ -43,6 +43,29 @@
     ssl_trusted_certificate /srv/nginx/ca-certs.pem;
     ssl_dhparam /srv/nginx/dhparam.pem;
 
+    # this block checks for maintenance.html file and if exists redirects all requests to maintenance page
+    # there are two exceptions for it /v1/Updates/Status and /auth_request endpoints
+    set $skip_maintenance 0;
+
+    if (-f /usr/share/pmm-server/maintenance/maintenance.html) {
+        set $skip_maintenance 1;
+    }
+
+    if ($request_uri ~* "^/v1/Updates/Status|^/auth_request") {
+        set $skip_maintenance 0;
+    }
+
+    if ($skip_maintenance = 1) {
+        return 503;
+    }
+
+    error_page 503 @maintenance;
+
+    location @maintenance {
+        root /usr/share/pmm-server/maintenance;
+        rewrite ^(.*)$ /maintenance.html break;
+    }
+
 
     # Enable passing of the remote user's IP address to all
     # proxied services using the X-Forwarded-For header

diff --git a/update/ansible/playbook/tasks/update.yml b/update/ansible/playbook/tasks/update.yml
@@ -39,19 +39,60 @@
         is_docker: True
       when: is_docker is undefined
   tasks:
-    # we need install this package here because it contain VERSION file
+    - name: Enable maintenance mode
+      copy:
+        src: maintenance.html
+        dest: /usr/share/pmm-server/maintenance/
+        mode: 0644
+
+    # we need to install this package here because it contains VERSION file
     - name: Remove percona-dashboard without architecture
       yum:
         name: percona-dashboards.*noarch
         state: absent
 
+    # see https://jira.percona.com/browse/PMM-8492 for details about a issue
+    - name: Delete experimental repo file in 2.16 version
+      file:
+        path: "/etc/yum.repos.d/percona-original-experimental.repo"
+        state: absent
+      register: experimental_repo_existed
+
     - name: Update percona-dashboards package
       yum:
         name:
           - percona-dashboards
           - percona-grafana
         state: latest
 
+    - name: Cleanup yum metadata
+      command: yum clean metadata
+      register: yum_clean_result
+      changed_when: "'Cleaning repos' in yum_clean_result.stdout"
+      when: experimental_repo_existed.changed
+      tags:
+        - skip_ansible_lint # '503 Tasks that run when changed should likely be handlers'.
+        # The handler looks bad in this case
+
+    # TODO: join with the command above
+    - name: Cleanup yum metadata
+      command: yum clean metadata
+      become: true
+      tags:
+        - skip_ansible_lint
+
+    # Split download and update to produce a bit more of progress output.
+    - name: Download pmm2 packages
+      yum:
+        name: "{{ pmm_packages }}"
+        state: latest
+        download_only: yes
+
+    - name: Update pmm2 packages
+      yum:
+        name: "{{ pmm_packages }}"
+        state: latest
+
     - name: Create supervisord dir
       file:
         path: /etc/supervisord.d/
@@ -62,27 +103,12 @@
         src: pmm.ini
         dest: /etc/supervisord.d/pmm.ini
 
+    # restart pmm-managed-init and pmm-managed first as they may update supervisord configuration on start
     - name: Generate new supervisor config
       command: pmm-managed-init
       register: managed_init_result
       changed_when: True
 
-    - name: Update postgresql version_1
-      command: sed -i 's:-D /srv/postgres$:-D /srv/postgres14:' /etc/supervisord.d/pmm.ini
-      changed_when: true
-
-    - name: Update postgresql version_2
-      command: sed -i 's:/usr/pgsql/bin/postgres:/usr/pgsql-14/bin/postgres:' /etc/supervisord.d/pmm.ini
-      changed_when: true
-
-    - name: Update postgresql version_3
-      command: sed -i 's:/srv/logs/postgresql.log:/srv/logs/postgresql14.log:' /etc/supervisord.d/pmm.ini
-      changed_when: true
-
-    - name: Update postgresql version_4
-      command: sed -i 's:/usr/pgsql-11/bin/postgres:/usr/pgsql-14/bin/postgres:' /etc/supervisord.d/pmm.ini
-      changed_when: true
-
     - name: Disable pmm-update-perform-init
       ini_file:
         path: /etc/supervisord.d/pmm.ini
@@ -195,48 +221,6 @@
     - name: Check reread results
       debug: var=reread_result.stdout_lines
 
-    # see https://jira.percona.com/browse/PMM-8492 for details about a issue
-    - name: Delete experimental repo file in 2.16 version
-      file:
-        path: "/etc/yum.repos.d/percona-original-experimental.repo"
-        state: absent
-      register: experimental_repo_existed
-
-    - name: Cleanup yum metadata
-      command: yum clean metadata
-      register: yum_clean_result
-      changed_when: "'Cleaning repos' in yum_clean_result.stdout"
-      when: experimental_repo_existed.changed
-      tags:
-        - skip_ansible_lint # '503 Tasks that run when changed should likely be handlers'.
-          # The handler looks bad in this case
-
-    # TODO: join with the command above
-    - name: Cleanup yum metadata
-      command: yum clean metadata
-      become: true
-      tags:
-        - skip_ansible_lint
-
-    # Split download and update to produce a bit more of progress output.
-    - name: Download pmm2 packages
-      yum:
-        name: "{{ pmm_packages }}"
-        state: latest
-        download_only: yes
-
-    - name: Update pmm2 packages
-      yum:
-        name: "{{ pmm_packages }}"
-        state: latest
-
-
-    # restart pmm-managed-init and pmm-managed first as they may update supervisord configuration on start
-    - name: Generate new supervisor config
-      command: pmm-managed-init
-      register: managed_init_result
-      changed_when: True
-
     - name: Restart pmm-managed EL7
       when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '7'
       command: supervisorctl {{ item }} pmm-managed
@@ -254,7 +238,7 @@
     # give pmm-managed time to update supervisord configuration,
     # and give update UI time to catch up after pmm-managed restart
     - name: Wait for pmm-managed
-      pause: seconds=5
+      pause: seconds=10
 
     - name: Update system packages
       yum:
@@ -325,19 +309,6 @@
         regexp: "set -o errexit"
         replace: ""
 
-    # TODO: Create /srv/alertmanager/data and /srv/victoriametrics/data in pmm-managed
-    # to support Docker-way (swap image) updates.
-    # https://jira.percona.com/browse/PMM-7024
-
-    - name: Create working directory for Alertmanager
-      file: path=/srv/alertmanager/data state=directory owner=pmm group=pmm
-
-    - name: Create working directory for VictoriaMetrics
-      file: path=/srv/victoriametrics/data state=directory owner=pmm group=pmm
-
-    - name: Create empty configuration file for VictoriaMetrics
-      file: path=/etc/victoriametrics-promscrape.yml state=touch owner=pmm group=pmm
-
     - name: Reread supervisord configuration again EL7
       when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '7'
       command: supervisorctl reread
@@ -460,6 +431,11 @@
       register: maintail_result
       changed_when: False
 
+    - name: Disable maintenance mode
+      file:
+        state: absent
+        path: /usr/share/pmm-server/maintenance/maintenance.html
+
     - name: Print supervisord logs
       debug: var=maintail_result.stdout_lines