From ef99a3c8bc09e9f03ee9aec5c07bfeca6b7d7adf Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 19 Feb 2018 14:27:39 +0100
Subject: [PATCH] Increase feature flag cache TTL to one hour

Flipper already takes care of flushing cache entries when
enabling/disabling features so it should be safe to increase the TTL.
This in turn should drastically reduce the number of Flipper queries
executed.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/40854
---
 changelogs/unreleased/flipper-caching.yml | 5 +++++
 config/initializers/flipper.rb            | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/flipper-caching.yml

diff --git a/changelogs/unreleased/flipper-caching.yml b/changelogs/unreleased/flipper-caching.yml
new file mode 100644
index 00000000000..6db27fd579e
--- /dev/null
+++ b/changelogs/unreleased/flipper-caching.yml
@@ -0,0 +1,5 @@
+---
+title: Increase feature flag cache TTL to one hour
+merge_request:
+author:
+type: performance
diff --git a/config/initializers/flipper.rb b/config/initializers/flipper.rb
index cc9167d29b9..c60ad535fd5 100644
--- a/config/initializers/flipper.rb
+++ b/config/initializers/flipper.rb
@@ -8,7 +8,7 @@ Flipper.configure do |config|
     cached_adapter = Flipper::Adapters::ActiveSupportCacheStore.new(
       adapter,
       Rails.cache,
-      expires_in: 10.seconds)
+      expires_in: 1.hour)
 
     Flipper.new(cached_adapter)
   end