From e56492c23fd5fdffa7bc35d16c34118c2ed2b801 Mon Sep 17 00:00:00 2001
From: Niclas Antti <niclas.antti@mariadb.com>
Date: Wed, 3 Oct 2018 19:05:31 +0300
Subject: [PATCH] MXS-1777 Make "Sample Max" of the server EMAverage adaptive

A rather simple but very effective method as testing shows.
---
 server/core/internal/server.hh |  9 +--------
 server/core/server.cc          | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/server/core/internal/server.hh b/server/core/internal/server.hh
index 962f7fbab..ca59a4c03 100644
--- a/server/core/internal/server.hh
+++ b/server/core/internal/server.hh
@@ -47,18 +47,11 @@ public:
         return m_response_time.average();
     }
 
-    void response_time_add(double ave, int num_samples)
-    {
-        m_response_time.add(ave, num_samples);
-    }
+    void response_time_add(double ave, int num_samples);
 
     mutable std::mutex m_lock;
 
 private:
-    // nantti, TODO. Decide whether to expose some of this in config, or if the values
-    // can be calculated at runtime. The "500" or sample_max affects how often a
-    // session should updates this stat. sample_max should be slightly lower than max sample
-    // rate (which is less than qps due to the noise filter).
     maxbase::EMAverage m_response_time;
 };
 
diff --git a/server/core/server.cc b/server/core/server.cc
index 55626a1b4..8d2cea8dd 100644
--- a/server/core/server.cc
+++ b/server/core/server.cc
@@ -1560,3 +1560,36 @@ double server_response_time_average(const SERVER* srv)
     const Server* server = static_cast<const Server*>(srv);
     return server->response_time_average();
 }
+
+/** Apply backend average and adjust sample_max, which determines the weight of a new average
+ *  applied to EMAverage.
+ *  Sample max is raised if the server is fast, aggresively lowered if the incoming average is clearly
+ *  lower than the EMA, else just lowered a bit. The normal increase and decrease, drifting, of the max
+ *  is done to follow the speed of a server. The important part is the lowering of max, to allow for a
+ *  server that is speeding up to be adjusted and used.
+ *
+ *  Three new magic numbers to replace the sample max magic number...
+ *
+ */
+void Server::response_time_add(double ave, int num_samples)
+{
+    constexpr double drift {1.1};
+    int current_max = m_response_time.sample_max();
+    int new_max {0};
+
+    if (num_samples >= current_max)
+    {
+        new_max = num_samples * drift;
+    }
+    else if (m_response_time.average() / ave > 2)
+    {
+        new_max = current_max * 0.5;
+    }
+    else
+    {
+        new_max = current_max / drift;
+    }
+
+    m_response_time.set_sample_max(new_max);
+    m_response_time.add(ave, num_samples);
+}