From 17f759bc08351c4d5272a09e44a50136c806a7af Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Tue, 2 Apr 2019 17:11:47 +0200
Subject: [PATCH] personnalisation des valeurs max connexion et keepalive

---
 dicos/29_one-master.xml | 15 +++++++++++++++
 tmpl/oned.conf          | 16 ++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/dicos/29_one-master.xml b/dicos/29_one-master.xml
index 3fad953..758fbb4 100644
--- a/dicos/29_one-master.xml
+++ b/dicos/29_one-master.xml
@@ -113,6 +113,18 @@
             <variable name='one_node_int_name' type='domain' description="Nom de l'interface de communication des nœuds"/>
             <variable name="one_vip" description="Adresse IP de la VIP OpenNebula" type="ip" mandatory="True"/>
             <variable name="one_vip_mask" description="Masque de sous-réseau de la VIP OpenNebula" type="netmask" mandatory="True"/>
+            <variable name="one_max_conn" description="Nombre maximum de connexion TCP simultanées maintenu avec le serveur" mode="expert" type='number'>
+                <value>15</value>
+            </variable>
+            <variable name="one_max_conn_backlog" description="Nombre maximum de connexion TCP simultanées accepté par le système d'exploitation" mode="expert" type='number'>
+                <value>15</value>
+            </variable>
+            <variable name="one_keepalive_timeout" description="Durée maximum d'une connexion RPC en secondes" mode="expert" type='number'>
+                <value>30</value>
+            </variable>
+            <variable name="one_rpc_log" description="Créer un fichier séparé pour les log XML-RPC" mode="expert">
+                <value>NO</value>
+            </variable>
         </family>
         <family name='Modèle' icon='cloud'>
             <variable name='hapy_init_master' type='oui/non' description="Activer l'auto-création du modèle de machine virtuelle pour installer un module EOLE">
@@ -157,6 +169,9 @@
         <check name="valid_enum" target="vnet_pilote">
             <param>['openvswitch']</param>
         </check>
+        <check name="valid_enum" target="one_rpc_log">
+            <param>['YES', 'NO']</param>
+        </check>
         <auto name='calc_multi_condition' target='activer_openvswitch'>
             <param>openvswitch</param>
             <param type="eole" name="condition_1">vnet_pilote</param>
diff --git a/tmpl/oned.conf b/tmpl/oned.conf
index ed0b407..827b3a2 100644
--- a/tmpl/oned.conf
+++ b/tmpl/oned.conf
@@ -164,12 +164,12 @@ FEDERATION = [
 ]
 
 RAFT = [
-    LIMIT_PURGE          = 100000,
-    LOG_RETENTION        = 500000,
-    LOG_PURGE_TIMEOUT    = 600,
+    LIMIT_PURGE          = 1000,
+    LOG_RETENTION        = 5000,
+    LOG_PURGE_TIMEOUT    = 60,
     ELECTION_TIMEOUT_MS  = 2500,
     BROADCAST_TIMEOUT_MS = 500,
-    XMLRPC_TIMEOUT_MS    = 450
+    XMLRPC_TIMEOUT_MS    = 5000
 ]
 
 %if %%activer_one_ha == 'oui'
@@ -241,12 +241,12 @@ DEFAULT_COST = [
 #     %% -- %
 #*******************************************************************************
 
-#MAX_CONN           = 15
-#MAX_CONN_BACKLOG   = 15
+MAX_CONN           = %%one_max_conn
+MAX_CONN_BACKLOG   = %%one_max_conn_backlog
 #KEEPALIVE_TIMEOUT  = 15
-#KEEPALIVE_MAX_CONN = 30
+KEEPALIVE_MAX_CONN = %%one_keepalive_timeout
 #TIMEOUT            = 15
-#RPC_LOG            = NO
+RPC_LOG            = %%one_rpc_log
 #MESSAGE_SIZE       = 1073741824
 #LOG_CALL_FORMAT    = "Req:%i UID:%u %m invoked %l20"