From 29aca663dda06260c40f2e51837f908bee0ffceb Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Mon, 3 Sep 2018 12:05:07 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20possibilit=C3=A9=20de=20sp?=
 =?UTF-8?q?=C3=A9cifier=20"innodb=5Flock=5Fwait=5Ftimeout"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dicos/25_bdd_server.xml | 3 +++
 tmpl/tunning.cnf        | 1 +
 2 files changed, 4 insertions(+)

diff --git a/dicos/25_bdd_server.xml b/dicos/25_bdd_server.xml
index c14f991..df9c1a0 100644
--- a/dicos/25_bdd_server.xml
+++ b/dicos/25_bdd_server.xml
@@ -64,6 +64,9 @@
             <variable name='dbInnoDBLogFileSize' type='number' description="Taille des fichiers de transaction InnoDB">
                 <value>6</value>
             </variable>
+            <variable name='dbInnoDBLockWaitTimeout' type='number' description="Nombre de millisecondes d'attente avant de fermer la connection en lock (innodb_lock_wait_timeout)">
+                <value>120</value>
+            </variable>
             <variable name="dbMaxConnections" type="number" description="Nombre de connection maximum pour le serveur de bases de données (max_connections)">
                 <value>100</value>
             </variable>
diff --git a/tmpl/tunning.cnf b/tmpl/tunning.cnf
index 329934c..cf1e5f3 100644
--- a/tmpl/tunning.cnf
+++ b/tmpl/tunning.cnf
@@ -5,6 +5,7 @@ skip-name-resolve
 innodb_buffer_pool_size=%%getMemoryPercentage(%%getVar('dbInnoDBBufferPoolPercentage', 10))
 innodb_log_buffer_size=%%{dbInnoDBLogBufferSize}M
 innodb_log_file_size=%%{dbInnoDBLogFileSize}M
+innodb_lock_wait_timeout=%%{dbInnoDBLockWaitTimeout}
 
 max_connections=%%dbMaxConnections
 thread_cache_size=%%dbThreadCacheSize