From e391fe1d6d39837d6aebb14f90e200fc6ff42d81 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 12 Dec 2017 15:11:34 +0100
Subject: Reduce cardinality of gitlab_cache_operation_duration_seconds
 histogram

---
 lib/gitlab/metrics/subscribers/rails_cache.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/metrics/subscribers/rails_cache.rb b/lib/gitlab/metrics/subscribers/rails_cache.rb
index efd3c9daf79..250897a79c2 100644
--- a/lib/gitlab/metrics/subscribers/rails_cache.rb
+++ b/lib/gitlab/metrics/subscribers/rails_cache.rb
@@ -66,7 +66,7 @@ module Gitlab
             :gitlab_cache_operation_duration_seconds,
             'Cache access time',
             Transaction::BASE_LABELS.merge({ action: nil }),
-            [0.001, 0.002, 0.005, 0.01, 0.02, 0.05, 0.1, 0.500, 2.0, 10.0]
+            [0.001, 0.01, 0.1, 1, 10]
           )
         end
 
-- 
cgit v1.2.1


From b02db1f4931060d9e28bd0d651dbea34c79340e2 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 12 Dec 2017 16:54:11 +0100
Subject: Fix gitaly_call_histogram to observe times in seconds correctly

---
 lib/gitlab/gitaly_client.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index b753ac46291..7aa2eafbb73 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -132,7 +132,7 @@ module Gitlab
       self.query_time += duration
       gitaly_call_histogram.observe(
         current_transaction_labels.merge(gitaly_service: service.to_s, rpc: rpc.to_s),
-        duration)
+        duration / 1000.0)
     end
 
     def self.current_transaction_labels
-- 
cgit v1.2.1


From a8ebed6016726722a2283458e4176fc9177558af Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 12 Dec 2017 18:12:49 +0100
Subject: Make `System.monotonic_time` retun seconds represented by float with
 microsecond precision

---
 lib/gitlab/gitaly_client.rb                 |  2 +-
 lib/gitlab/metrics/method_call.rb           | 18 +++++++++++-------
 lib/gitlab/metrics/samplers/ruby_sampler.rb |  2 +-
 lib/gitlab/metrics/system.rb                |  9 +++++----
 lib/gitlab/metrics/transaction.rb           |  8 ++++++--
 5 files changed, 24 insertions(+), 15 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index 7aa2eafbb73..b753ac46291 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -132,7 +132,7 @@ module Gitlab
       self.query_time += duration
       gitaly_call_histogram.observe(
         current_transaction_labels.merge(gitaly_service: service.to_s, rpc: rpc.to_s),
-        duration / 1000.0)
+        duration)
     end
 
     def self.current_transaction_labels
diff --git a/lib/gitlab/metrics/method_call.rb b/lib/gitlab/metrics/method_call.rb
index 65d55576ac2..6fb8f564237 100644
--- a/lib/gitlab/metrics/method_call.rb
+++ b/lib/gitlab/metrics/method_call.rb
@@ -4,7 +4,7 @@ module Gitlab
     class MethodCall
       MUTEX = Mutex.new
       BASE_LABELS = { module: nil, method: nil }.freeze
-      attr_reader :real_time, :cpu_time, :call_count, :labels
+      attr_reader :real_time_seconds, :cpu_time, :call_count, :labels
 
       def self.call_duration_histogram
         return @call_duration_histogram if @call_duration_histogram
@@ -27,37 +27,41 @@ module Gitlab
         @transaction = transaction
         @name = name
         @labels = { module: @module_name, method: @method_name }
-        @real_time = 0
+        @real_time_seconds = 0
         @cpu_time = 0
         @call_count = 0
       end
 
       # Measures the real and CPU execution time of the supplied block.
       def measure
-        start_real = System.monotonic_time
+        start_real_seconds = System.monotonic_time
         start_cpu = System.cpu_time
         retval = yield
 
-        real_time = System.monotonic_time - start_real
+        real_time_seconds = System.monotonic_time - start_real_seconds
         cpu_time = System.cpu_time - start_cpu
 
-        @real_time += real_time
+        @real_time_seconds += real_time_seconds
         @cpu_time += cpu_time
         @call_count += 1
 
         if call_measurement_enabled? && above_threshold?
-          self.class.call_duration_histogram.observe(@transaction.labels.merge(labels), real_time / 1000.0)
+          self.class.call_duration_histogram.observe(@transaction.labels.merge(labels), real_time_seconds)
         end
 
         retval
       end
 
+      def real_time_milliseconds
+        (real_time_seconds * 1000.0).to_i
+      end
+
       # Returns a Metric instance of the current method call.
       def to_metric
         Metric.new(
           Instrumentation.series,
           {
-            duration: real_time,
+            duration: real_time_milliseconds,
             cpu_duration: cpu_time,
             call_count: call_count
           },
diff --git a/lib/gitlab/metrics/samplers/ruby_sampler.rb b/lib/gitlab/metrics/samplers/ruby_sampler.rb
index b68800417a2..4e1ea62351f 100644
--- a/lib/gitlab/metrics/samplers/ruby_sampler.rb
+++ b/lib/gitlab/metrics/samplers/ruby_sampler.rb
@@ -52,7 +52,7 @@ module Gitlab
           metrics[:memory_usage].set(labels, System.memory_usage)
           metrics[:file_descriptors].set(labels, System.file_descriptor_count)
 
-          metrics[:sampler_duration].observe(labels.merge(worker_label), (System.monotonic_time - start_time) / 1000.0)
+          metrics[:sampler_duration].observe(labels.merge(worker_label), System.monotonic_time - start_time)
         ensure
           GC::Profiler.clear
         end
diff --git a/lib/gitlab/metrics/system.rb b/lib/gitlab/metrics/system.rb
index c2cbd3c16a1..b31cc6236d1 100644
--- a/lib/gitlab/metrics/system.rb
+++ b/lib/gitlab/metrics/system.rb
@@ -51,11 +51,12 @@ module Gitlab
         Process.clock_gettime(Process::CLOCK_REALTIME, precision)
       end
 
-      # Returns the current monotonic clock time in a given precision.
+      # Returns the current monotonic clock time as seconds with microseconds precision.
       #
-      # Returns the time as a Fixnum.
-      def self.monotonic_time(precision = :millisecond)
-        Process.clock_gettime(Process::CLOCK_MONOTONIC, precision)
+      # Returns the time as a Float.
+      def self.monotonic_time
+
+        Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second)
       end
     end
   end
diff --git a/lib/gitlab/metrics/transaction.rb b/lib/gitlab/metrics/transaction.rb
index ee3afc5ffdb..16f0969ab74 100644
--- a/lib/gitlab/metrics/transaction.rb
+++ b/lib/gitlab/metrics/transaction.rb
@@ -35,6 +35,10 @@ module Gitlab
         @finished_at ? (@finished_at - @started_at) : 0.0
       end
 
+      def duration_milliseconds
+        (duration * 1000).to_i
+      end
+
       def allocated_memory
         @memory_after - @memory_before
       end
@@ -50,7 +54,7 @@ module Gitlab
         @memory_after = System.memory_usage
         @finished_at = System.monotonic_time
 
-        self.class.metric_transaction_duration_seconds.observe(labels, duration * 1000)
+        self.class.metric_transaction_duration_seconds.observe(labels, duration)
         self.class.metric_transaction_allocated_memory_bytes.observe(labels, allocated_memory * 1024.0)
 
         Thread.current[THREAD_KEY] = nil
@@ -97,7 +101,7 @@ module Gitlab
       end
 
       def track_self
-        values = { duration: duration, allocated_memory: allocated_memory }
+        values = { duration: duration_milliseconds, allocated_memory: allocated_memory }
 
         @values.each do |name, value|
           values[name] = value
-- 
cgit v1.2.1


From 54f13b1ec8542dc5085e0367734e8344c2c3d01e Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 9 Dec 2017 01:01:42 -0800
Subject: Add rate limiting to guard against excessive scheduling of pipelines

---
 lib/gitlab/action_rate_limiter.rb | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 lib/gitlab/action_rate_limiter.rb

(limited to 'lib')

diff --git a/lib/gitlab/action_rate_limiter.rb b/lib/gitlab/action_rate_limiter.rb
new file mode 100644
index 00000000000..c3af583a3ed
--- /dev/null
+++ b/lib/gitlab/action_rate_limiter.rb
@@ -0,0 +1,31 @@
+module Gitlab
+  # This class implements a simple rate limiter that can be used to throttle
+  # certain actions. Unlike Rack Attack and Rack::Throttle, which operate at
+  # the middleware level, this can be used at the controller level.
+  class ActionRateLimiter
+    TIME_TO_EXPIRE = 60 # 1 min
+
+    attr_accessor :action, :expiry_time
+
+    def initialize(action:, expiry_time: TIME_TO_EXPIRE)
+      @action = action
+      @expiry_time = expiry_time
+    end
+
+    def increment(key)
+      value = 0
+
+      Gitlab::Redis::Cache.with do |redis|
+        cache_key = "action_rate_limiter:#{action}:#{key}"
+        value = redis.incr(cache_key)
+        redis.expire(cache_key, expiry_time) if value == 1
+      end
+
+      value.to_i
+    end
+
+    def throttled?(key, threshold_value)
+      self.increment(key) > threshold_value
+    end
+  end
+end
-- 
cgit v1.2.1


From 8b939bfab769810ba56f5f4ca18632fd7ae435db Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 9 Dec 2017 15:45:01 -0800
Subject: Add spec for ActionRateLimiter

---
 lib/gitlab/action_rate_limiter.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/action_rate_limiter.rb b/lib/gitlab/action_rate_limiter.rb
index c3af583a3ed..7b231ac14ca 100644
--- a/lib/gitlab/action_rate_limiter.rb
+++ b/lib/gitlab/action_rate_limiter.rb
@@ -16,12 +16,12 @@ module Gitlab
       value = 0
 
       Gitlab::Redis::Cache.with do |redis|
-        cache_key = "action_rate_limiter:#{action}:#{key}"
+        cache_key = "action_rate_limiter:#{action.to_s}:#{key}"
         value = redis.incr(cache_key)
         redis.expire(cache_key, expiry_time) if value == 1
       end
 
-      value.to_i
+      value
     end
 
     def throttled?(key, threshold_value)
-- 
cgit v1.2.1


From 02e7e499d4011733c1cf0f6fb675dd2d309f0d52 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 9 Dec 2017 21:00:34 -0800
Subject: Fix Rubocop offense and use a symbol instead of a string

---
 lib/gitlab/action_rate_limiter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/action_rate_limiter.rb b/lib/gitlab/action_rate_limiter.rb
index 7b231ac14ca..53add503c60 100644
--- a/lib/gitlab/action_rate_limiter.rb
+++ b/lib/gitlab/action_rate_limiter.rb
@@ -16,7 +16,7 @@ module Gitlab
       value = 0
 
       Gitlab::Redis::Cache.with do |redis|
-        cache_key = "action_rate_limiter:#{action.to_s}:#{key}"
+        cache_key = "action_rate_limiter:#{action}:#{key}"
         value = redis.incr(cache_key)
         redis.expire(cache_key, expiry_time) if value == 1
       end
-- 
cgit v1.2.1


From 4b0465f20de1bf58326c7daf6876b63438f00d84 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 12 Dec 2017 15:46:05 -0800
Subject: Address review comments with playing pipeline scheduler

---
 lib/gitlab/action_rate_limiter.rb | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/action_rate_limiter.rb b/lib/gitlab/action_rate_limiter.rb
index 53add503c60..4cd3bdefda3 100644
--- a/lib/gitlab/action_rate_limiter.rb
+++ b/lib/gitlab/action_rate_limiter.rb
@@ -12,11 +12,15 @@ module Gitlab
       @expiry_time = expiry_time
     end
 
+    # Increments the given cache key and increments the value by 1 with the
+    # given expiration time. Returns the incremented value.
+    #
+    # key - An array of ActiveRecord instances
     def increment(key)
       value = 0
 
       Gitlab::Redis::Cache.with do |redis|
-        cache_key = "action_rate_limiter:#{action}:#{key}"
+        cache_key = action_key(key)
         value = redis.incr(cache_key)
         redis.expire(cache_key, expiry_time) if value == 1
       end
@@ -24,8 +28,20 @@ module Gitlab
       value
     end
 
+    # Increments the given key and returns true if the action should
+    # be throttled.
+    #
+    # key - An array of ActiveRecord instances
+    # threshold_value - The maximum number of times this action should occur in the given time interval
     def throttled?(key, threshold_value)
       self.increment(key) > threshold_value
     end
+
+    private
+
+    def action_key(key)
+      serialized = key.map { |obj| "#{obj.class.model_name.to_s.underscore}:#{obj.id}" }.join(":")
+      "action_rate_limiter:#{action}:#{serialized}"
+    end
   end
 end
-- 
cgit v1.2.1


From c6edae38870a4228e3b964d647b9ef588df11f27 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Tue, 5 Dec 2017 14:15:30 +0100
Subject: Load commit in batches for pipelines#index

Uses `list_commits_by_oid` on the CommitService, to request the needed
commits for pipelines. These commits are needed to display the user that
created the commit and the commit title.

This includes fixes for tests failing that depended on the commit
being `nil`. However, now these are batch loaded, this doesn't happen
anymore and the commits are an instance of BatchLoader.
---
 lib/gitlab/git/commit.rb                   | 13 +++++++++++++
 lib/gitlab/gitaly_client/commit_service.rb |  9 +++++++++
 2 files changed, 22 insertions(+)

(limited to 'lib')

diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb
index e90b158fb34..145721dea76 100644
--- a/lib/gitlab/git/commit.rb
+++ b/lib/gitlab/git/commit.rb
@@ -228,6 +228,19 @@ module Gitlab
             end
           end
         end
+
+        # Only to be used when the object ids will not necessarily have a
+        # relation to each other. The last 10 commits for a branch for example,
+        # should go through .where
+        def batch_by_oid(repo, oids)
+          repo.gitaly_migrate(:list_commits_by_oid) do |is_enabled|
+            if is_enabled
+              repo.gitaly_commit_client.list_commits_by_oid(oids)
+            else
+              oids.map { |oid| find(repo, oid) }.compact
+            end
+          end
+        end
       end
 
       def initialize(repository, raw_commit, head = nil)
diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb
index 7985f5b5457..fb3e27770b4 100644
--- a/lib/gitlab/gitaly_client/commit_service.rb
+++ b/lib/gitlab/gitaly_client/commit_service.rb
@@ -169,6 +169,15 @@ module Gitlab
         consume_commits_response(response)
       end
 
+      def list_commits_by_oid(oids)
+        request = Gitaly::ListCommitsByOidRequest.new(repository: @gitaly_repo, oid: oids)
+
+        response = GitalyClient.call(@repository.storage, :commit_service, :list_commits_by_oid, request, timeout: GitalyClient.medium_timeout)
+        consume_commits_response(response)
+      rescue GRPC::Unknown # If no repository is found, happens mainly during testing
+        []
+      end
+
       def commits_by_message(query, revision: '', path: '', limit: 1000, offset: 0)
         request = Gitaly::CommitsByMessageRequest.new(
           repository: @gitaly_repo,
-- 
cgit v1.2.1


From 3c545133e8f23b57698046bae8be23e2bc457aca Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 19 Dec 2017 17:45:25 +0100
Subject: Fix tests and formatting

---
 lib/gitlab/metrics/influx_db.rb   | 1 +
 lib/gitlab/metrics/method_call.rb | 2 +-
 lib/gitlab/metrics/system.rb      | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/metrics/influx_db.rb b/lib/gitlab/metrics/influx_db.rb
index bdf7910b7c7..153e236d018 100644
--- a/lib/gitlab/metrics/influx_db.rb
+++ b/lib/gitlab/metrics/influx_db.rb
@@ -38,6 +38,7 @@ module Gitlab
         # This is memoized since this method is called for every instrumented
         # method. Loading data from an external cache on every method call slows
         # things down too much.
+        # in milliseconds
         @method_call_threshold ||= settings[:method_call_threshold]
       end
 
diff --git a/lib/gitlab/metrics/method_call.rb b/lib/gitlab/metrics/method_call.rb
index 6fb8f564237..a030092df37 100644
--- a/lib/gitlab/metrics/method_call.rb
+++ b/lib/gitlab/metrics/method_call.rb
@@ -72,7 +72,7 @@ module Gitlab
       # Returns true if the total runtime of this method exceeds the method call
       # threshold.
       def above_threshold?
-        real_time >= Metrics.method_call_threshold
+        real_time_milliseconds >= Metrics.method_call_threshold
       end
 
       def call_measurement_enabled?
diff --git a/lib/gitlab/metrics/system.rb b/lib/gitlab/metrics/system.rb
index b31cc6236d1..4852017bf38 100644
--- a/lib/gitlab/metrics/system.rb
+++ b/lib/gitlab/metrics/system.rb
@@ -55,7 +55,6 @@ module Gitlab
       #
       # Returns the time as a Float.
       def self.monotonic_time
-
         Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second)
       end
     end
-- 
cgit v1.2.1


From 3e4b45fc216875ff25647675d92448a53a740d9b Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 14 Dec 2017 13:32:55 -0600
Subject: Only include the user's ID in the time_spent command's update hash

Previously, this would include the entire User record in the update
hash, which was rendered in the response using `to_json`, erroneously
exposing every attribute of that record, including their (now removed)
private token.

Now we only include the user ID, and perform the lookup on-demand.
---
 lib/api/time_tracking_endpoints.rb    | 4 ++--
 lib/api/v3/time_tracking_endpoints.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/api/time_tracking_endpoints.rb b/lib/api/time_tracking_endpoints.rb
index df4632346dd..2bb451dea89 100644
--- a/lib/api/time_tracking_endpoints.rb
+++ b/lib/api/time_tracking_endpoints.rb
@@ -85,7 +85,7 @@ module API
 
         update_issuable(spend_time: {
           duration: Gitlab::TimeTrackingFormatter.parse(params.delete(:duration)),
-          user: current_user
+          user_id: current_user.id
         })
       end
 
@@ -97,7 +97,7 @@ module API
         authorize! update_issuable_key, load_issuable
 
         status :ok
-        update_issuable(spend_time: { duration: :reset, user: current_user })
+        update_issuable(spend_time: { duration: :reset, user_id: current_user.id })
       end
 
       desc "Show time stats for a project #{issuable_name}"
diff --git a/lib/api/v3/time_tracking_endpoints.rb b/lib/api/v3/time_tracking_endpoints.rb
index d5b90e435ba..1aad39815f9 100644
--- a/lib/api/v3/time_tracking_endpoints.rb
+++ b/lib/api/v3/time_tracking_endpoints.rb
@@ -86,7 +86,7 @@ module API
 
           update_issuable(spend_time: {
                             duration: Gitlab::TimeTrackingFormatter.parse(params.delete(:duration)),
-                            user: current_user
+                            user_id: current_user.id
                           })
         end
 
@@ -98,7 +98,7 @@ module API
           authorize! update_issuable_key, load_issuable
 
           status :ok
-          update_issuable(spend_time: { duration: :reset, user: current_user })
+          update_issuable(spend_time: { duration: :reset, user_id: current_user.id })
         end
 
         desc "Show time stats for a project #{issuable_name}"
-- 
cgit v1.2.1


From c9732b3c6dc07b4ffd0df9c2ae88e1f67cd56243 Mon Sep 17 00:00:00 2001
From: Mark Fletcher <mark@gitlab.com>
Date: Tue, 19 Dec 2017 21:57:46 +0000
Subject: Employ declared_params in finder methods for MR and Issue API lists

- Ensure that unwanted params are no passed to actual finder classes
---
 lib/api/issues.rb         | 2 +-
 lib/api/merge_requests.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 5f943ba27d1..b29c5848aef 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -8,7 +8,7 @@ module API
 
     helpers do
       def find_issues(args = {})
-        args = params.merge(args)
+        args = declared_params.merge(args)
 
         args.delete(:id)
         args[:milestone_title] = args.delete(:milestone)
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index d34886fca2e..c95e28edbef 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -8,7 +8,7 @@ module API
 
     helpers do
       def find_merge_requests(args = {})
-        args = params.merge(args)
+        args = declared_params.merge(args)
 
         args[:milestone_title] = args.delete(:milestone)
         args[:label_name] = args.delete(:labels)
-- 
cgit v1.2.1


From 055543b915c13df57e13629cd49ca9d63b6e3e76 Mon Sep 17 00:00:00 2001
From: Mark Fletcher <mark@gitlab.com>
Date: Tue, 19 Dec 2017 22:00:17 +0000
Subject: Add optional `search` param for Merge Requests API

---
 lib/api/merge_requests.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index c95e28edbef..02f2b75ab9d 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -41,6 +41,7 @@ module API
         optional :scope, type: String, values: %w[created-by-me assigned-to-me all],
                          desc: 'Return merge requests for the given scope: `created-by-me`, `assigned-to-me` or `all`'
         optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji'
+        optional :search, type: String, desc: 'Search merge requests for text present in the title or description'
         use :pagination
       end
     end
-- 
cgit v1.2.1


From ed715b7926c31fddb1c835823d509672663e23e6 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 19 Dec 2017 19:40:43 +0100
Subject: use in_milliseconds rails helper

---
 lib/gitlab/metrics/method_call.rb | 4 ++--
 lib/gitlab/metrics/transaction.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/metrics/method_call.rb b/lib/gitlab/metrics/method_call.rb
index a030092df37..bb39b1d5462 100644
--- a/lib/gitlab/metrics/method_call.rb
+++ b/lib/gitlab/metrics/method_call.rb
@@ -27,7 +27,7 @@ module Gitlab
         @transaction = transaction
         @name = name
         @labels = { module: @module_name, method: @method_name }
-        @real_time_seconds = 0
+        @real_time_seconds = 0.0
         @cpu_time = 0
         @call_count = 0
       end
@@ -53,7 +53,7 @@ module Gitlab
       end
 
       def real_time_milliseconds
-        (real_time_seconds * 1000.0).to_i
+        real_time_seconds.in_milliseconds.to_i
       end
 
       # Returns a Metric instance of the current method call.
diff --git a/lib/gitlab/metrics/transaction.rb b/lib/gitlab/metrics/transaction.rb
index 16f0969ab74..e7975c023a9 100644
--- a/lib/gitlab/metrics/transaction.rb
+++ b/lib/gitlab/metrics/transaction.rb
@@ -36,7 +36,7 @@ module Gitlab
       end
 
       def duration_milliseconds
-        (duration * 1000).to_i
+        duration.in_milliseconds.to_i
       end
 
       def allocated_memory
-- 
cgit v1.2.1


From 338f1eaf354a31663afbda3d91776f7f506b90f1 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Wed, 20 Dec 2017 19:13:11 +0100
Subject: Migrate to Project#empty_repo?

---
 lib/gitlab/github_import/importer/repository_importer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/github_import/importer/repository_importer.rb b/lib/gitlab/github_import/importer/repository_importer.rb
index 9cf2e7fd871..7dd68a0d1cd 100644
--- a/lib/gitlab/github_import/importer/repository_importer.rb
+++ b/lib/gitlab/github_import/importer/repository_importer.rb
@@ -29,7 +29,7 @@ module Gitlab
             # this code, e.g. because we had to retry this job after
             # `import_wiki?` raised a rate limit error. In this case we'll skip
             # re-importing the main repository.
-            if project.repository.empty_repo?
+            if project.empty_repo?
               import_repository
             else
               true
-- 
cgit v1.2.1


From 28fba5ed99c6f8b4e7e534f9c2046d1c5ab38607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kim=20Carlb=C3=A4cker?= <kim.carlbacker@gmail.com>
Date: Wed, 20 Dec 2017 18:29:52 +0000
Subject: Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"

This reverts merge request !15712
---
 lib/gitlab/git/repository.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 848a782446a..044c60caa05 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1101,17 +1101,12 @@ module Gitlab
         end
       end
 
-      def write_ref(ref_path, ref, force: false)
+      def write_ref(ref_path, ref)
         raise ArgumentError, "invalid ref_path #{ref_path.inspect}" if ref_path.include?(' ')
         raise ArgumentError, "invalid ref #{ref.inspect}" if ref.include?("\x00")
 
-        ref = "refs/heads/#{ref}" unless ref.start_with?("refs") || ref =~ /\A[a-f0-9]+\z/i
-
-        rugged.references.create(ref_path, ref, force: force)
-      rescue Rugged::ReferenceError => ex
-        raise GitError, "could not create ref #{ref_path}: #{ex}"
-      rescue Rugged::OSError => ex
-        raise GitError, "could not create ref #{ref_path}: #{ex}"
+        input = "update #{ref_path}\x00#{ref}\x00\x00"
+        run_git!(%w[update-ref --stdin -z]) { |stdin| stdin.write(input) }
       end
 
       def fetch_ref(source_repository, source_ref:, target_ref:)
-- 
cgit v1.2.1


From 040167f0724027020f2d63b6e43481fb3e29dbfc Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Wed, 20 Dec 2017 19:30:58 +0100
Subject: Use seconds where possible, and convert to milliseconds for Influxdb
 consumption

---
 lib/gitlab/metrics/method_call.rb | 24 ++++++++++--------------
 lib/gitlab/metrics/system.rb      |  8 ++++----
 2 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/metrics/method_call.rb b/lib/gitlab/metrics/method_call.rb
index bb39b1d5462..f4a916f154d 100644
--- a/lib/gitlab/metrics/method_call.rb
+++ b/lib/gitlab/metrics/method_call.rb
@@ -4,7 +4,7 @@ module Gitlab
     class MethodCall
       MUTEX = Mutex.new
       BASE_LABELS = { module: nil, method: nil }.freeze
-      attr_reader :real_time_seconds, :cpu_time, :call_count, :labels
+      attr_reader :real_time, :cpu_time, :call_count, :labels
 
       def self.call_duration_histogram
         return @call_duration_histogram if @call_duration_histogram
@@ -27,42 +27,38 @@ module Gitlab
         @transaction = transaction
         @name = name
         @labels = { module: @module_name, method: @method_name }
-        @real_time_seconds = 0.0
-        @cpu_time = 0
+        @real_time = 0.0
+        @cpu_time = 0.0
         @call_count = 0
       end
 
       # Measures the real and CPU execution time of the supplied block.
       def measure
-        start_real_seconds = System.monotonic_time
+        start_real = System.monotonic_time
         start_cpu = System.cpu_time
         retval = yield
 
-        real_time_seconds = System.monotonic_time - start_real_seconds
+        real_time = System.monotonic_time - start_real
         cpu_time = System.cpu_time - start_cpu
 
-        @real_time_seconds += real_time_seconds
+        @real_time += real_time
         @cpu_time += cpu_time
         @call_count += 1
 
         if call_measurement_enabled? && above_threshold?
-          self.class.call_duration_histogram.observe(@transaction.labels.merge(labels), real_time_seconds)
+          self.class.call_duration_histogram.observe(@transaction.labels.merge(labels), real_time)
         end
 
         retval
       end
 
-      def real_time_milliseconds
-        real_time_seconds.in_milliseconds.to_i
-      end
-
       # Returns a Metric instance of the current method call.
       def to_metric
         Metric.new(
           Instrumentation.series,
           {
-            duration: real_time_milliseconds,
-            cpu_duration: cpu_time,
+            duration: real_time.in_milliseconds.to_i,
+            cpu_duration: cpu_time.in_milliseconds.to_i,
             call_count: call_count
           },
           method: @name
@@ -72,7 +68,7 @@ module Gitlab
       # Returns true if the total runtime of this method exceeds the method call
       # threshold.
       def above_threshold?
-        real_time_milliseconds >= Metrics.method_call_threshold
+        real_time.in_milliseconds >= Metrics.method_call_threshold
       end
 
       def call_measurement_enabled?
diff --git a/lib/gitlab/metrics/system.rb b/lib/gitlab/metrics/system.rb
index 4852017bf38..e60e245cf89 100644
--- a/lib/gitlab/metrics/system.rb
+++ b/lib/gitlab/metrics/system.rb
@@ -35,19 +35,19 @@ module Gitlab
       if Process.const_defined?(:CLOCK_THREAD_CPUTIME_ID)
         def self.cpu_time
           Process
-            .clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID, :millisecond)
+            .clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID, :float_second)
         end
       else
         def self.cpu_time
           Process
-            .clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID, :millisecond)
+            .clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID, :float_second)
         end
       end
 
       # Returns the current real time in a given precision.
       #
-      # Returns the time as a Fixnum.
-      def self.real_time(precision = :millisecond)
+      # Returns the time as a Float for precision = :float_second.
+      def self.real_time(precision = :float_second)
         Process.clock_gettime(Process::CLOCK_REALTIME, precision)
       end
 
-- 
cgit v1.2.1


From d2f1d585e10e3e728f968ceae6b275e4d9bc59f4 Mon Sep 17 00:00:00 2001
From: Jan Provaznik <jprovaznik@gitlab.com>
Date: Fri, 15 Dec 2017 11:21:12 +0100
Subject: Skip projects filter on merge requests search

When searching for merge requests, an additional subquery
is added which by default filters only merge requests which belong
to source or target project user has permission for.

This filter is not needed because more restrictive filter
which checks if user has permission for target project
is used in the query.

So unless a custom projects filter is used by user, it's possible
to skip the default projects filter and speed up the final query.

Related to #40540
---
 lib/gitlab/search_results.rb | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb
index fef9d3e31d4..7037e2e61cc 100644
--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
@@ -27,10 +27,17 @@ module Gitlab
     # It allows us to search only for projects user has access to
     attr_reader :limit_projects
 
-    def initialize(current_user, limit_projects, query)
+    # Whether a custom filter is used to restrict scope of projects.
+    # If the default filter (which lists all projects user has access to)
+    # is used, we can skip it when filtering merge requests and optimize the
+    # query
+    attr_reader :default_project_filter
+
+    def initialize(current_user, limit_projects, query, default_project_filter: false)
       @current_user = current_user
       @limit_projects = limit_projects || Project.all
       @query = query
+      @default_project_filter = default_project_filter
     end
 
     def objects(scope, page = nil)
@@ -94,7 +101,11 @@ module Gitlab
     end
 
     def merge_requests
-      merge_requests = MergeRequestsFinder.new(current_user).execute.in_projects(project_ids_relation)
+      merge_requests = MergeRequestsFinder.new(current_user).execute
+      unless default_project_filter
+        merge_requests = merge_requests.in_projects(project_ids_relation)
+      end
+
       merge_requests =
         if query =~ /[#!](\d+)\z/
           merge_requests.where(iid: $1)
-- 
cgit v1.2.1