Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tristan Cavelier
slapos
Commits
2cc2b283
Commit
2cc2b283
authored
Jun 09, 2015
by
Saurabh
Committed by
Julien Muchembled
Jun 11, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NEO: make it possible to choose TokuDB engine
parent
61929809
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
3 deletions
+13
-3
slapos/recipe/neoppod.py
slapos/recipe/neoppod.py
+5
-1
software/neoppod/README.txt
software/neoppod/README.txt
+2
-0
software/neoppod/instance-neo-storage-mysql.cfg.in
software/neoppod/instance-neo-storage-mysql.cfg.in
+1
-0
software/neoppod/my.cnf.in
software/neoppod/my.cnf.in
+3
-0
software/neoppod/software.cfg
software/neoppod/software.cfg
+2
-2
No files found.
slapos/recipe/neoppod.py
View file @
2cc2b283
...
@@ -76,11 +76,15 @@ class Storage(NeoBaseRecipe):
...
@@ -76,11 +76,15 @@ class Storage(NeoBaseRecipe):
_binding_port_mandatory
=
False
_binding_port_mandatory
=
False
def
_getOptionList
(
self
):
def
_getOptionList
(
self
):
r
eturn
[
r
=
[
'-d'
,
self
.
options
[
'database-parameters'
],
'-d'
,
self
.
options
[
'database-parameters'
],
'-a'
,
self
.
options
[
'database-adapter'
],
'-a'
,
self
.
options
[
'database-adapter'
],
'-w'
,
self
.
options
[
'wait-database'
],
'-w'
,
self
.
options
[
'wait-database'
],
]
]
engine
=
self
.
options
.
get
(
'engine'
)
if
engine
:
# old versions of NEO don't support -e
r
+=
'-e'
,
engine
return
r
class
Admin
(
NeoBaseRecipe
):
class
Admin
(
NeoBaseRecipe
):
def
_getOptionList
(
self
):
def
_getOptionList
(
self
):
...
...
software/neoppod/README.txt
View file @
2cc2b283
...
@@ -47,3 +47,5 @@ One can specify following parameters in each of the dictionary.
...
@@ -47,3 +47,5 @@ One can specify following parameters in each of the dictionary.
* 'mysql': Dictionary containing configuration options for MySQL.
* 'mysql': Dictionary containing configuration options for MySQL.
* 'engine': Configures storage engine,
currently only InnoDB and TokuDB are supported.
software/neoppod/instance-neo-storage-mysql.cfg.in
View file @
2cc2b283
...
@@ -59,6 +59,7 @@ cluster = {{ dumps(slapparameter_dict['cluster']) }}
...
@@ -59,6 +59,7 @@ cluster = {{ dumps(slapparameter_dict['cluster']) }}
masters = ${publish:masters}
masters = ${publish:masters}
database-adapter = MySQL
database-adapter = MySQL
wait-database = 60
wait-database = 60
engine = {{ slapparameter_dict.get('engine', '') }}
[logrotate-storage]
[logrotate-storage]
recipe = slapos.cookbook:logrotate.d
recipe = slapos.cookbook:logrotate.d
...
...
software/neoppod/my.cnf.in
View file @
2cc2b283
...
@@ -14,6 +14,9 @@ init_file = {{ parameter_dict['init-file'] }}
...
@@ -14,6 +14,9 @@ init_file = {{ parameter_dict['init-file'] }}
log_warnings = 1
log_warnings = 1
disable-log-bin
disable-log-bin
### Enables TokuDB
plugin-load = ha_tokudb
## The following settings come from ERP5 configuration.
## The following settings come from ERP5 configuration.
max_allowed_packet = 128M
max_allowed_packet = 128M
...
...
software/neoppod/software.cfg
View file @
2cc2b283
...
@@ -55,12 +55,12 @@ md5sum = 9563ce56676bf9ae5e77fe12e9020289
...
@@ -55,12 +55,12 @@ md5sum = 9563ce56676bf9ae5e77fe12e9020289
[instance-neo-storage-mysql]
[instance-neo-storage-mysql]
< = cluster
< = cluster
md5sum =
5f671be9b78c71718a964120a6494c7c
md5sum =
6ad04cea50d2de97079cbbf2c73cd5d1
[template-my-cnf]
[template-my-cnf]
< = cluster
< = cluster
url = ${:_profile_base_location_}/my.cnf.in
url = ${:_profile_base_location_}/my.cnf.in
md5sum =
b8d0c0a6f7a7fe46c8c2f916ee6edced
md5sum =
febd3ed58043ce1367b86cf6e4e69700
[template]
[template]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment