summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extra/docker/mariadb/conf1/my.cnf8
-rw-r--r--pom.xml2
2 files changed, 5 insertions, 5 deletions
diff --git a/extra/docker/mariadb/conf1/my.cnf b/extra/docker/mariadb/conf1/my.cnf
index 0be1bd7a..c6631fb4 100644
--- a/extra/docker/mariadb/conf1/my.cnf
+++ b/extra/docker/mariadb/conf1/my.cnf
@@ -141,10 +141,10 @@ binlog_format=row
##innodb_log_group_home_dir = //opt/app/mysql/iblogs
# You can set .._buffer_pool_size up to 50 - 80 %
# of RAM but beware of setting memory usage too high
-innodb_buffer_pool_size = 6380M
+innodb_buffer_pool_size = 128M
#innodb_additional_mem_pool_size = 2M
# Set .._log_file_size to 25 % of buffer pool size
-innodb_log_file_size = 150M
+innodb_log_file_size = 10M
innodb_log_files_in_group = 3
innodb_log_buffer_size = 8M
#innodb_flush_log_at_trx_commit = 1
@@ -156,7 +156,7 @@ transaction-isolation=READ-COMMITTED
####### Galera parameters #######
## Galera Provider configuration
wsrep_provider=/usr/lib/galera/libgalera_smm.so
-wsrep_provider_options="gcache.size=2G; gcache.page_size=1G"
+wsrep_provider_options="gcache.size=128M; gcache.page_size=10M"
## Galera Cluster configuration
wsrep_cluster_name="MSO-automated-tests-cluster"
wsrep_cluster_address="gcomm://"
@@ -169,7 +169,7 @@ wsrep_sst_method=rsync
## Galera Node configuration
wsrep_node_name="mariadb1"
##wsrep_node_address="192.169.3.184"
-wsrep_on=ON
+wsrep_on=OFF
## Status notification
#wsrep_notify_cmd=/opt/app/mysql/bin/wsrep_notify
#######
diff --git a/pom.xml b/pom.xml
index e11e44e1..bb2534d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -763,7 +763,7 @@
</volumes>
<wait>
<log>socket: '/var/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution</log>
- <time>1200000</time>
+ <time>600000</time>
</wait>
<ports>
<port>${docker.mariadb.port.host}:3306</port>