Merge lp:~jjo/charms/trusty/percona-cluster/expose_sst-method_for_xtrabackup-v2 into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next

[JuanJo Ciarlante]

[jjo, r=] expose wsrep_sst_method, and default it to recommended value:
'xtrabackup-v2', as per URL at description.

[JuanJo Ciarlante (jjo)]

I had at least one case where current wsrep_sst_method = xtrabackup failed, while xtrabackup-v2 did ok.
Note that xtrabackup-v2 is the recommended value as per:
https://www.percona.com/doc/percona-xtradb-cluster/5.5/wsrep-system-index.html#wsrep_sst_method

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #12856 percona-cluster-next for jjo mp276117
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/12856/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #11935 percona-cluster-next for jjo mp276117
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11935/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7647 percona-cluster-next for jjo mp276117
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7647/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #12859 percona-cluster-next for jjo mp276117
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/12859/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #11938 percona-cluster-next for jjo mp276117
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11938/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7651 percona-cluster-next for jjo mp276117
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7651/

[David Ames (thedac)]

JuanJo,

Thanks for this. I have run into this myself.
LGTM, merging.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-07-27 09:44:19 +0000
+++ config.yaml	2015-10-29 12:31:57 +0000
@@ -65,6 +65,13 @@
     description: |
       Re-sync account password for new cluster nodes; must be configured
       pre-deployment for Active-Active clusters.
+  sst-method:
+    type: string
+    default: xtrabackup-v2
+    description: |
+      Percona method for taking the State Snapshot Transfer (SST), can be:
+      'rsync', 'xtrabackup', 'xtrabackup-v2', 'mysqldump', 'skip' - see
+      https://www.percona.com/doc/percona-xtradb-cluster/5.5/wsrep-system-index.html#wsrep_sst_method
   min-cluster-size:
     type: int
     default:

=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2015-10-10 16:07:05 +0000
+++ hooks/percona_hooks.py	2015-10-29 12:31:57 +0000
@@ -121,7 +121,7 @@
         'private_address': get_host_ip(),
         'clustered': clustered,
         'cluster_hosts': ",".join(hosts),
-        'sst_method': 'xtrabackup',
+        'sst_method': config('sst-method'),
         'sst_password': config('sst-password'),
         'innodb_file_per_table': config('innodb-file-per-table'),
         'table_open_cache': config('table-open-cache'),