Merge lp:~paolo-de-rosa/charms/trusty/percona-cluster/innodb_flush_log into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next

Proposed by Paolo de Rosa
Status: Work in progress
Proposed branch: lp:~paolo-de-rosa/charms/trusty/percona-cluster/innodb_flush_log
Merge into: lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next
Diff against target: 55 lines (+32/-0) (has conflicts)
2 files modified
config.yaml (+30/-0)
templates/my.cnf (+2/-0)
Text conflict in config.yaml
To merge this branch: bzr merge lp:~paolo-de-rosa/charms/trusty/percona-cluster/innodb_flush_log
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Billy Olsen Needs Fixing
Ryan Beisner (community) Needs Fixing
Mario Splivalo (community) Approve
Review via email: mp+263534@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #5704 percona-cluster-next for paolo-de-rosa mp263534
    LINT FAIL: lint-test failed

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

Full lint test output: http://paste.ubuntu.com/11805556/
Build: http://10.245.162.77:8080/job/charm_lint_check/5704/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #5336 percona-cluster-next for paolo-de-rosa mp263534
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #4892 percona-cluster-next for paolo-de-rosa mp263534
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

Revision history for this message
Mario Splivalo (mariosplivalo) wrote :

This is fine, there are situations where one doesn't need percona to issue fsync() on innodb redo logs after each commit.

I'd just shorten the description of the option, just explaining what possible options are and then perhaps add URL link that points to percona/mysql documentation.

There is one issue I'd like to see fixed before this merge is approved by me - comments are inline.

review: Needs Fixing
67. By Paolo de Rosa

As 'innodb-flush-log-at-trx-commit' has default set to '1' it is always present in config so there is no need for an 'if' here.

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #5728 percona-cluster-next for paolo-de-rosa mp263534
    LINT FAIL: lint-test failed

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

Full lint test output: http://paste.ubuntu.com/11811106/
Build: http://10.245.162.77:8080/job/charm_lint_check/5728/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #5360 percona-cluster-next for paolo-de-rosa mp263534
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #4920 percona-cluster-next for paolo-de-rosa mp263534
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

Revision history for this message
Mario Splivalo (mariosplivalo) wrote :

This now looks fine to me.

review: Approve
68. By Paolo de Rosa

synced /next

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #6632 percona-cluster-next for paolo-de-rosa mp263534
    LINT FAIL: lint-test failed

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

Full lint test output: http://paste.ubuntu.com/11921247/
Build: http://10.245.162.77:8080/job/charm_lint_check/6632/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #6259 percona-cluster-next for paolo-de-rosa mp263534
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5262 percona-cluster-next for paolo-de-rosa mp263534
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

Revision history for this message
Ryan Beisner (1chb1n) wrote :

The percona-cluster/next amulet tests are now known to be passing. Can this proposed branch be rebased to pull in those test updates?

69. By Paolo de Rosa

synced /next

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #6359 percona-cluster-next for paolo-de-rosa mp263534
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #6732 percona-cluster-next for paolo-de-rosa mp263534
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 200
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11925356/
Build: http://10.245.162.77:8080/job/charm_lint_check/6732/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5274 percona-cluster-next for paolo-de-rosa mp263534
    AMULET FAIL: amulet-test failed

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

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

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Please take note of the failed charm proof (lint) test re: innodb-flush-log-at-trx-commit, which appears to also be causing the amulet test to fail. Thanks!

review: Needs Fixing
70. By Paolo de Rosa

fixed option type

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #6412 percona-cluster-next for paolo-de-rosa mp263534
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #6885 percona-cluster-next for paolo-de-rosa mp263534
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5327 percona-cluster-next for paolo-de-rosa mp263534
    AMULET OK: passed

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

Revision history for this message
Billy Olsen (billy-olsen) wrote :

Paolo, I have a nit with the config description and would like to see that flushed out a bit more. There's a lot more information on the setting itself upstream which isn't included here. I don't think we should include it here specifically but instead should possibly reference the upstream documentation in addition to a basic discussion.

review: Needs Fixing
71. By Paolo de Rosa

Update description of innodb_flush_log_at_trx_commit option

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9229 percona-cluster-next for paolo-de-rosa mp263534
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #8530 percona-cluster-next for paolo-de-rosa mp263534
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6191 percona-cluster-next for paolo-de-rosa mp263534
    AMULET OK: passed

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

Revision history for this message
James Page (james-page) wrote :

Hi Paola

Currently showing a merge conflict - please could you rebase and then I think this is good to be landed once OSCI has re-tested.

review: Needs Fixing

Unmerged revisions

71. By Paolo de Rosa

Update description of innodb_flush_log_at_trx_commit option

70. By Paolo de Rosa

fixed option type

69. By Paolo de Rosa

synced /next

68. By Paolo de Rosa

synced /next

67. By Paolo de Rosa

As 'innodb-flush-log-at-trx-commit' has default set to '1' it is always present in config so there is no need for an 'if' here.

66. By Paolo de Rosa

Added InnoDB flush log variable

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2015-07-27 09:44:19 +0000
3+++ config.yaml 2015-09-02 10:30:50 +0000
4@@ -140,8 +140,38 @@
5 If you're running multiple environments with the same services in them
6 this allows you to differentiate between them.
7 nagios_servicegroups:
8+<<<<<<< TREE
9 type: string
10 default: ''
11 description: |
12 A comma-separated list of nagios servicegroups. If left empty, the
13 nagios_context will be used as the servicegroup.
14+=======
15+ default: ""
16+ type: string
17+ description: |
18+ A comma-separated list of nagios servicegroups.
19+ If left empty, the nagios_context will be used as the servicegroup
20+ innodb-buffer-pool-size:
21+ default:
22+ type: string
23+ description: |
24+ By default this value will be set according to the 50% of system total memory
25+ but also can be set to any specific value for the system.
26+ Suffix this value with 'K','M','G', or 'T' to get the relevant kilo/mega/etc. bytes.
27+ If suffixed with %, one will get that percentage of system total memory devoted.
28+ innodb-flush-log-at-trx-commit:
29+ type: int
30+ default: 1
31+ description: |
32+ This option determines how often are written the redo logs when data is committed.
33+ This setting is very important to improve performances or security when you run
34+ mysql on hardware without a battery backed write cache.
35+ More info http://dev.mysql.com/doc/refman/5.1/en/innodb-parameters.html
36+ min-cluster-size:
37+ type: int
38+ default:
39+ description: |
40+ Minimum number of units expected to exist before charm will attempt to
41+ bootstrap percona cluster. If no value is provided this setting is ignored.
42+>>>>>>> MERGE-SOURCE
43
44=== modified file 'templates/my.cnf'
45--- templates/my.cnf 2015-06-04 14:40:54 +0000
46+++ templates/my.cnf 2015-09-02 10:30:50 +0000
47@@ -74,6 +74,8 @@
48 # query cache is not supported with Active/Active configuration
49 innodb_buffer_pool_size = {{ innodb_buffer_pool_size }}
50
51+innodb_flush_log_at_trx_commit = {{ innodb_flush_log_at_trx_commit }}
52+
53 {% if ipv6 -%}
54 [sst]
55 sockopt=,pf=ip6

Subscribers

People subscribed via source and target branches