Merge lp:~barryprice/charms/trusty/mysql/add-innodb_file_per_table into lp:charms/trusty/mysql

[Barry Price]

[Barry Price (barryprice)]

So this change would deviate from the current package defaults, but the charm already does this by setting non-default values for e.g. bind_address, skip-name-resolve etc.

n.b. Setting innodb_file_per_table is the new upstream default as of MySQL 5.6:

https://dev.mysql.com/doc/refman/5.6/en/innodb-multiple-tablespaces.html

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

charm_unit_test #15169 mysql for barryprice mp281398
    UNIT OK: passed

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

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

charm_lint_check #16248 mysql for barryprice mp281398
    LINT OK: passed

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

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

charm_amulet_test #8444 mysql for barryprice mp281398
    AMULET OK: passed

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

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

charm_unit_test #15486 mysql for barryprice mp281398
    UNIT OK: passed

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

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

charm_amulet_test #8503 mysql for barryprice mp281398
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/14407632/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8503/

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

charm_amulet_test #8704 mysql for barryprice mp281398
    AMULET OK: passed

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

[Ryan Beisner (1chb1n)]

Thank you for your work on this. I've reviewed with peers in openstack engineering team, tested the charm upgrade story for an existing deployment (http://pastebin.ubuntu.com/14487765/). We think this is sane.

review: Approve

[Ryan Beisner (1chb1n)]

Also, the amulet tests are passing (http://pastebin.ubuntu.com/14487795/).

Note that amulet test failure #8503 was a network hiccup (false failure).

[José Antonio Rey (jose)]

Merging as per Ryan's comment.

review: Approve

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-03-04 14:10:30 +0000
+++ hooks/config-changed	2015-12-30 02:25:41 +0000
@@ -299,8 +299,10 @@
 # * InnoDB
 #
 # InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
+# We also set innodb_file_per_table to avoid having ibdata1 fill the disk.
 # Read the manual for more InnoDB related options. There are many!
 #
+innodb_file_per_table
 innodb_buffer_pool_size = %(innodb-buffer-pool-size)s
 innodb_flush_log_at_trx_commit = %(innodb-flush-log-at-trx-commit)s
 sync_binlog = %(sync-binlog)s