PMM-9660 fix database load issue (#180)

percona · Mar 16, 2022 · 53597a1 · 53597a1
1 parent bda2b8d
commit 53597a1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/ansible/playbook/tasks/roles/sqlite-to-postgres/tasks/main.yml b/ansible/playbook/tasks/roles/sqlite-to-postgres/tasks/main.yml
@@ -7,6 +7,14 @@
     group: grafana
     mode: '0700'
 
+- name: Create backup for SQLite Grafana database
+  copy:
+    src: /srv/grafana/grafana.db
+    dest: "{{ grafana_backup_dir }}/grafana.db"
+    owner: grafana
+    group: grafana
+    mode: '0700'
+
 - name: Stop grafana before upgrade
   supervisorctl:
     name: 'grafana'
@@ -48,6 +56,11 @@
     name: grafana
     state: stopped
 
+# https://jira.percona.com/browse/PMM-9660
+- name: Remove ` symbol from data field
+  command: sqlite3 /srv/grafana/grafana.db -cmd ".timeout 60000" "UPDATE dashboard SET data = REPLACE(data, '`', '');"
+  changed_when: True
+
 - name: Run grafana migrator
   command: grafana-db-migrator --change-char-to-text --reset-home-dashboard /srv/grafana/grafana.db "postgres://grafana:grafana@localhost:5432/grafana?sslmode=disable"
   register: migrator_output
@@ -79,14 +92,6 @@
   register: migrator_output
   changed_when: "'All done' in migrator_output.stdout"
 
-- name: Create backup for SQLite Grafana database
-  copy:
-    src: /srv/grafana/grafana.db
-    dest: "{{ grafana_backup_dir }}/grafana.db"
-    owner: grafana
-    group: grafana
-    mode: '0700'
-
 - name: Remove SQLite Grafana database
   file:
     path: /srv/grafana/grafana.db

diff --git a/ansible/playbook/tasks/update.yml b/ansible/playbook/tasks/update.yml
@@ -49,7 +49,6 @@
       yum:
         name: "grafana-db-migrator"
         state: latest
-      ignore_errors: yes # TODO DELETE BEFORE RELEASE
 
     - name: Create grafana config
       include_role: