diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-03 19:33:07 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-03 19:33:07 +0300 |
| commit | 4250f38f44556644532ab40bfb11993753ec3c70 (patch) | |
| tree | 06940a6d879a920ee5580d8caa90cc3be94fb596 /lib | |
| parent | 0b97aa5e453c95afbdc5608c3cb072b0fc53a7dd (diff) | |
| parent | e3b626dae8af7fb3b98a42b78afbb249a0c0c36b (diff) | |
Merge branch 'sherlock-ignore-cache' into 'master'
Ignore SQL CACHE hits in Sherlock
See merge request gitlab-org/gitlab-ce!15182
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/sherlock/transaction.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/sherlock/transaction.rb b/lib/gitlab/sherlock/transaction.rb index 3489fb251b6..400a552bf99 100644 --- a/lib/gitlab/sherlock/transaction.rb +++ b/lib/gitlab/sherlock/transaction.rb @@ -89,7 +89,9 @@ module Gitlab ActiveSupport::Notifications.subscribe('sql.active_record') do |_, start, finish, _, data| next unless same_thread? - track_query(data[:sql].strip, data[:binds], start, finish) + unless data.fetch(:cached, data[:name] == 'CACHE') + track_query(data[:sql].strip, data[:binds], start, finish) + end end end |