Commit 0b1bd1b0 authored by Julien Muchembled's avatar Julien Muchembled

NEO: add support for new --disable-drop-partitions storage option

parent 126a4b5e
...@@ -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('disable-drop-partitions'):
r.append('--disable-drop-partitions')
return r return r
class Admin(NeoBaseRecipe): class Admin(NeoBaseRecipe):
......
...@@ -70,6 +70,11 @@ ...@@ -70,6 +70,11 @@
"default": 1, "default": 1,
"type": "integer" "type": "integer"
}, },
"disable-drop-partitions": {
"description": "Set the --disable-drop-partitions option for storage nodes.",
"default": false,
"type": "boolean"
},
"mysql": { "mysql": {
"description": "Dictionary containing parameters for MySQL.", "description": "Dictionary containing parameters for MySQL.",
"default": {}, "default": {},
......
...@@ -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', '') }}
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)) -%}
{% set storage_id = 'neo-storage-' ~ i -%} {% set storage_id = 'neo-storage-' ~ i -%}
......
...@@ -99,7 +99,7 @@ md5sum = 1fee10f02c2fa2a581e21878ca0fd704 ...@@ -99,7 +99,7 @@ md5sum = 1fee10f02c2fa2a581e21878ca0fd704
[instance-neo-storage-mysql] [instance-neo-storage-mysql]
<= download-base-neo <= download-base-neo
md5sum = 836ae32d4b6d502d0a597cb28ebf7616 md5sum = 67d623d631c2f99e33bcabc79fc9cccf
[template-neo-my-cnf] [template-neo-my-cnf]
<= download-base-neo <= download-base-neo
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment