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
Gwenaël Samain
slapos
Commits
164fe068
Commit
164fe068
authored
Nov 07, 2017
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NEO: add support for new --dedup storage option
parent
81f8ee91
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
1 deletion
+9
-1
slapos/recipe/neoppod.py
slapos/recipe/neoppod.py
+2
-0
software/neoppod/instance-neo-input-schema.json
software/neoppod/instance-neo-input-schema.json
+5
-0
software/neoppod/instance-neo-storage-mysql.cfg.in
software/neoppod/instance-neo-storage-mysql.cfg.in
+1
-0
software/neoppod/software-common.cfg
software/neoppod/software-common.cfg
+1
-1
No files found.
slapos/recipe/neoppod.py
View file @
164fe068
...
@@ -92,6 +92,8 @@ class Storage(NeoBaseRecipe):
...
@@ -92,6 +92,8 @@ class Storage(NeoBaseRecipe):
engine
=
self
.
options
.
get
(
'engine'
)
engine
=
self
.
options
.
get
(
'engine'
)
if
engine
:
# old versions of NEO don't support -e
if
engine
:
# old versions of NEO don't support -e
r
+=
'-e'
,
engine
r
+=
'-e'
,
engine
if
self
.
options
.
get
(
'dedup'
):
r
.
append
(
'--dedup'
)
if
self
.
options
.
get
(
'disable-drop-partitions'
):
if
self
.
options
.
get
(
'disable-drop-partitions'
):
r
.
append
(
'--disable-drop-partitions'
)
r
.
append
(
'--disable-drop-partitions'
)
return
r
return
r
...
...
software/neoppod/instance-neo-input-schema.json
View file @
164fe068
...
@@ -70,6 +70,11 @@
...
@@ -70,6 +70,11 @@
"default"
:
1
,
"default"
:
1
,
"type"
:
"integer"
"type"
:
"integer"
},
},
"data-deduplication"
:
{
"description"
:
"Set the --dedup option for storage nodes."
,
"default"
:
false
,
"type"
:
"boolean"
},
"disable-drop-partitions"
:
{
"disable-drop-partitions"
:
{
"description"
:
"Set the --disable-drop-partitions option for storage nodes."
,
"description"
:
"Set the --disable-drop-partitions option for storage nodes."
,
"default"
:
false
,
"default"
:
false
,
...
...
software/neoppod/instance-neo-storage-mysql.cfg.in
View file @
164fe068
...
@@ -87,6 +87,7 @@ masters = ${publish:masters}
...
@@ -87,6 +87,7 @@ masters = ${publish:masters}
database-adapter = MySQL
database-adapter = MySQL
wait-database = -1
wait-database = -1
engine = {{ slapparameter_dict.get('engine', '') }}
engine = {{ slapparameter_dict.get('engine', '') }}
dedup = {{ dumps(bool(slapparameter_dict.get('data-deduplication'))) }}
disable-drop-partitions = {{ dumps(bool(slapparameter_dict.get('disable-drop-partitions'))) }}
disable-drop-partitions = {{ dumps(bool(slapparameter_dict.get('disable-drop-partitions'))) }}
{% for i in range(slapparameter_dict.get('storage-count', 1)) -%}
{% for i in range(slapparameter_dict.get('storage-count', 1)) -%}
...
...
software/neoppod/software-common.cfg
View file @
164fe068
...
@@ -98,7 +98,7 @@ md5sum = 1fee10f02c2fa2a581e21878ca0fd704
...
@@ -98,7 +98,7 @@ md5sum = 1fee10f02c2fa2a581e21878ca0fd704
[instance-neo-storage-mysql]
[instance-neo-storage-mysql]
<= download-base-neo
<= download-base-neo
md5sum =
67d623d631c2f99e33bcabc79fc9cccf
md5sum =
366e51c0dbd85e511a31e403b8704735
[template-neo-my-cnf]
[template-neo-my-cnf]
<= download-base-neo
<= download-base-neo
...
...
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