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
140
      If you're running multiple environments with the same services in them
140
      If you're running multiple environments with the same services in them
6
141
      this allows you to differentiate between them.
141
      this allows you to differentiate between them.
7
142
  nagios_servicegroups:
142
  nagios_servicegroups:
8
143
<<<<<<< TREE
9
143
    type: string
144
    type: string
10
144
    default: ''
145
    default: ''
11
145
    description: |
146
    description: |
12
146
      A comma-separated list of nagios servicegroups. If left empty, the
147
      A comma-separated list of nagios servicegroups. If left empty, the
13
147
      nagios_context will be used as the servicegroup.
148
      nagios_context will be used as the servicegroup.
14
149
=======
15
150
    default: ""
16
151
    type: string
17
152
    description: |
18
153
        A comma-separated list of nagios servicegroups.
19
154
        If left empty, the nagios_context will be used as the servicegroup
20
155
  innodb-buffer-pool-size:
21
156
    default:
22
157
    type: string
23
158
    description: |
24
159
      By default this value will be set according to the 50% of system total memory
25
160
      but also can be set to any specific value for the system.
26
161
      Suffix this value with 'K','M','G', or 'T' to get the relevant kilo/mega/etc. bytes.
27
162
      If suffixed with %, one will get that percentage of system total memory devoted.
28
163
  innodb-flush-log-at-trx-commit:
29
164
    type: int
30
165
    default: 1
31
166
    description: |
32
167
      This option determines how often are written the redo logs when data is committed.
33
168
      This setting is very important to improve performances or security when you run
34
169
      mysql on hardware without a battery backed write cache.
35
170
      More info http://dev.mysql.com/doc/refman/5.1/en/innodb-parameters.html
36
171
  min-cluster-size:
37
172
    type: int
38
173
    default:
39
174
    description: |
40
175
      Minimum number of units expected to exist before charm will attempt to
41
176
      bootstrap percona cluster. If no value is provided this setting is ignored.
42
177
>>>>>>> MERGE-SOURCE
43
148
178
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
74
# query cache is not supported with Active/Active configuration
74
# query cache is not supported with Active/Active configuration
49
75
innodb_buffer_pool_size = {{ innodb_buffer_pool_size }}
75
innodb_buffer_pool_size = {{ innodb_buffer_pool_size }}
50
76
76
51
77
innodb_flush_log_at_trx_commit = {{ innodb_flush_log_at_trx_commit }}
52
78
53
77
{% if ipv6 -%}
79
{% if ipv6 -%}
54
78
[sst]
80
[sst]
55
79
sockopt=,pf=ip6
81
sockopt=,pf=ip6
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
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
James Page		Needs Fixing on 2016-02-18
Billy Olsen	2015-07-01	Needs Fixing on 2015-08-31
Ryan Beisner (community)		Needs Fixing on 2015-07-24
Mario Splivalo (community)		Approve on 2015-07-09
Review via email: mp+263534@code.launchpad.net