From 498dab2437d2466bdc5975f9824731e3291ee6d6 Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@gmail.com>
Date: Thu, 7 Sep 2017 22:19:39 +0200
Subject: [PATCH] Fluentd: reduce CPU and I/O consumption

Disable the additional watch timer (enable_watch_timer).
Setting this parameter to false will significantly reduce CPU and I/O
consumption when tailing a large number of files on systems with inotify
support.

Change-Id: Ib432e6cdece01dbb94b3d2f3d7fbdd04b81d25fa
---
 ansible/roles/common/templates/conf/input/00-global.conf.j2      | 1 +
 ansible/roles/common/templates/conf/input/02-mariadb.conf.j2     | 1 +
 ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2    | 1 +
 .../roles/common/templates/conf/input/04-openstack-wsgi.conf.j2  | 1 +
 ansible/roles/common/templates/conf/input/05-libvirt.conf.j2     | 1 +
 5 files changed, 5 insertions(+)

diff --git a/ansible/roles/common/templates/conf/input/00-global.conf.j2 b/ansible/roles/common/templates/conf/input/00-global.conf.j2
index 013785250a..5ddcc6e6fd 100644
--- a/ansible/roles/common/templates/conf/input/00-global.conf.j2
+++ b/ansible/roles/common/templates/conf/input/00-global.conf.j2
@@ -51,4 +51,5 @@
   time_key Timestamp
   time_format %F %T.%L
   ignore_repeated_permission_error true
+  enable_watch_timer false
 </source>
diff --git a/ansible/roles/common/templates/conf/input/02-mariadb.conf.j2 b/ansible/roles/common/templates/conf/input/02-mariadb.conf.j2
index b435cb1a48..aed9c1b05c 100644
--- a/ansible/roles/common/templates/conf/input/02-mariadb.conf.j2
+++ b/ansible/roles/common/templates/conf/input/02-mariadb.conf.j2
@@ -8,4 +8,5 @@
   format_firstline /^\d{6}/
   format1 /^(?<time>\d{6} \d{1,2}:\d{1,2}:\d{1,2}) \[(?<severity_label>\S+)\] (?<Payload>.*)/
   time_format %y%m%d %k:%M:%S
+  enable_watch_timer false
 </source>
diff --git a/ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2 b/ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2
index 286bef728a..ba38b14da6 100644
--- a/ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2
+++ b/ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2
@@ -8,4 +8,5 @@
   format_firstline /^\s*$/
   format1 /^=(?<log_level>\w+) REPORT==== (?<Times>[^ ]+) ===\n/
   format2 /^(?<Payload>.*)/
+  enable_watch_timer false
 </source>
diff --git a/ansible/roles/common/templates/conf/input/04-openstack-wsgi.conf.j2 b/ansible/roles/common/templates/conf/input/04-openstack-wsgi.conf.j2
index 10410f2715..53b927f32c 100644
--- a/ansible/roles/common/templates/conf/input/04-openstack-wsgi.conf.j2
+++ b/ansible/roles/common/templates/conf/input/04-openstack-wsgi.conf.j2
@@ -6,4 +6,5 @@
   pos_file /var/run/{{ fluentd_dir }}/kolla-openstack-wsgi.pos
   tag kolla.*
   format /^(?<message>.*)$/
+  enable_watch_timer false
 </source>
diff --git a/ansible/roles/common/templates/conf/input/05-libvirt.conf.j2 b/ansible/roles/common/templates/conf/input/05-libvirt.conf.j2
index c4fb4c8179..3c41a4652e 100644
--- a/ansible/roles/common/templates/conf/input/05-libvirt.conf.j2
+++ b/ansible/roles/common/templates/conf/input/05-libvirt.conf.j2
@@ -7,4 +7,5 @@
   format /^(?<Timestamp>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\+\d{4}): (?<Pid>\d+): (?<log_level>\S+) : (?<Payload>.*)?$/
   time_key Timestamp
   time_format %F %T.%L%z
+  enable_watch_timer false
 </source>