Commit c82921dc authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

stack/erp5: enable rocksdb-large-prefix to support larger key length.

parent 17546989
...@@ -136,6 +136,9 @@ link-binary = ...@@ -136,6 +136,9 @@ link-binary =
[template-my-cnf] [template-my-cnf]
<= download-base <= download-base
[template-mariadb-init-file]
<= download-base
[template-mariadb-initial-setup] [template-mariadb-initial-setup]
<= download-base <= download-base
...@@ -219,6 +222,7 @@ context = ...@@ -219,6 +222,7 @@ context =
key template_mariadb template-mariadb:target key template_mariadb template-mariadb:target
key template_mariadb_initial_setup template-mariadb-initial-setup:target key template_mariadb_initial_setup template-mariadb-initial-setup:target
key template_my_cnf template-my-cnf:target key template_my_cnf template-my-cnf:target
key template_mariadb_init_file template-mariadb-init-file:target
key template_mysqld_wrapper template-mysqld-wrapper:output key template_mysqld_wrapper template-mysqld-wrapper:output
key template_postfix template-postfix:target key template_postfix template-postfix:target
key template_postfix_aliases template-postfix-aliases:target key template_postfix_aliases template-postfix-aliases:target
......
...@@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196 ...@@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196
[template-mariadb] [template-mariadb]
filename = instance-mariadb.cfg.in filename = instance-mariadb.cfg.in
md5sum = 93b2277185e4949a3d17be79d3710d2d md5sum = 73fe73b0c2fc022acbfbc0d076365fd2
[template-kumofs] [template-kumofs]
filename = instance-kumofs.cfg.in filename = instance-kumofs.cfg.in
...@@ -42,7 +42,11 @@ md5sum = f45dc4568b63de39f49b8fecca5deef1 ...@@ -42,7 +42,11 @@ md5sum = f45dc4568b63de39f49b8fecca5deef1
[template-my-cnf] [template-my-cnf]
filename = my.cnf.in filename = my.cnf.in
md5sum = dc5ce05cc9bcc482300d0ef6fcef66bc md5sum = 9355de58b9eb7a121e81d0bc033d6d86
[template-mariadb-init-file]
filename = mariadb_init_file.sql.in
md5sum = abc60a4d82dce00e5039d22230bccb87
[template-mariadb-initial-setup] [template-mariadb-initial-setup]
filename = mariadb_initial_setup.sql.in filename = mariadb_initial_setup.sql.in
...@@ -70,7 +74,7 @@ md5sum = b95084ae9eed95a68eada45e28ef0c04 ...@@ -70,7 +74,7 @@ md5sum = b95084ae9eed95a68eada45e28ef0c04
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 39e391372cc616ea5d1d6559621e6747 md5sum = d853f6c9b7074b7d827bd66db6ed1a2f
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
......
...@@ -123,6 +123,7 @@ tmp-directory = ${directory:tmp} ...@@ -123,6 +123,7 @@ tmp-directory = ${directory:tmp}
etc-directory = ${directory:etc} etc-directory = ${directory:etc}
plugin-directory = {{ dumps(parameter_dict['mroonga-mariadb-plugin-dir']) }} plugin-directory = {{ dumps(parameter_dict['mroonga-mariadb-plugin-dir']) }}
groonga-plugins-path = {{ parameter_dict['groonga-plugins-path'] }} groonga-plugins-path = {{ parameter_dict['groonga-plugins-path'] }}
mariadb-init-file-path = ${mariadb-init-file:output}
pid-file = ${directory:run}/mariadb.pid pid-file = ${directory:run}/mariadb.pid
error-log = ${directory:log}/mariadb_error.log error-log = ${directory:log}/mariadb_error.log
slow-query-log = ${directory:log}/mariadb_slowquery.log slow-query-log = ${directory:log}/mariadb_slowquery.log
...@@ -154,6 +155,12 @@ output = ${directory:etc}/mariadb.cnf ...@@ -154,6 +155,12 @@ output = ${directory:etc}/mariadb.cnf
url = {{ parameter_dict['template-my-cnf'] }} url = {{ parameter_dict['template-my-cnf'] }}
context = section parameter_dict my-cnf-parameters context = section parameter_dict my-cnf-parameters
[mariadb-init-file]
recipe = slapos.recipe.template:jinja2
output = ${directory:etc}/mariadb-init.sql
url = {{ parameter_dict['template-mariadb-init-file'] }}
context = section parameter_dict my-cnf-parameters
[init-script-parameters] [init-script-parameters]
database-list = {{ dumps(database_list + test_database_list) }} database-list = {{ dumps(database_list + test_database_list) }}
mroonga-mariadb-install-sql = {{ dumps(parameter_dict['mroonga-mariadb-install-sql']) }} mroonga-mariadb-install-sql = {{ dumps(parameter_dict['mroonga-mariadb-install-sql']) }}
......
...@@ -178,6 +178,7 @@ gzip-location = {{ gzip_location }} ...@@ -178,6 +178,7 @@ gzip-location = {{ gzip_location }}
xz-utils-location = {{ xz_utils_location }} xz-utils-location = {{ xz_utils_location }}
mariadb-location = {{ mariadb_location }} mariadb-location = {{ mariadb_location }}
template-my-cnf = {{ template_my_cnf }} template-my-cnf = {{ template_my_cnf }}
template-mariadb-init-file = {{ template_mariadb_init_file }}
template-mariadb-initial-setup = {{ template_mariadb_initial_setup }} template-mariadb-initial-setup = {{ template_mariadb_initial_setup }}
template-mysqld-wrapper = {{ template_mysqld_wrapper }} template-mysqld-wrapper = {{ template_mysqld_wrapper }}
link-binary = {{ dumps(mariadb_link_binary) }} link-binary = {{ dumps(mariadb_link_binary) }}
......
SET GLOBAL rocksdb_large_prefix=1;
...@@ -33,6 +33,7 @@ default_time_zone = '+00:00' ...@@ -33,6 +33,7 @@ default_time_zone = '+00:00'
plugin_load = ha_mroonga;ha_rocksdb plugin_load = ha_mroonga;ha_rocksdb
plugin-dir = {{ parameter_dict['plugin-directory'] }} plugin-dir = {{ parameter_dict['plugin-directory'] }}
init_file = {{ parameter_dict['mariadb-init-file-path'] }}
max_connections = {{ parameter_dict['max-connection-count'] }} max_connections = {{ parameter_dict['max-connection-count'] }}
......
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