Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 1 deletions

diff --git a/lib/gitlab/daemon.rb b/lib/gitlab/daemon.rb
index 8a253893892..ddb9d907640 100644
--- a/lib/gitlab/daemon.rb
+++ b/lib/gitlab/daemon.rb
@@ -28,6 +28,10 @@ module Gitlab
       true
     end
 
+    def thread_name
+      self.class.name.demodulize.underscore
+    end
+
     def start
       return unless enabled?
 
@@ -35,7 +39,10 @@ module Gitlab
         break thread if thread?
 
         if start_working
-          @thread = Thread.new { run_thread }
+          @thread = Thread.new do
+            Thread.current.name = thread_name
+            run_thread
+          end
         end
       end
     end
diff --git a/lib/gitlab/sidekiq_daemon/monitor.rb b/lib/gitlab/sidekiq_daemon/monitor.rb
index a3d61c69ae1..0723b514c90 100644
--- a/lib/gitlab/sidekiq_daemon/monitor.rb
+++ b/lib/gitlab/sidekiq_daemon/monitor.rb
@@ -4,6 +4,7 @@ module Gitlab
   module SidekiqDaemon
     class Monitor < Daemon
       include ::Gitlab::Utils::StrongMemoize
+      extend ::Gitlab::Utils::Override
 
       NOTIFICATION_CHANNEL = 'sidekiq:cancel:notifications'
       CANCEL_DEADLINE = 24.hours.seconds
@@ -24,6 +25,11 @@ module Gitlab
         @jobs_mutex = Mutex.new
       end
 
+      override :thread_name
+      def thread_name
+        "job_monitor"
+      end
+
       def within_job(worker_class, jid, queue)
         jobs_mutex.synchronize do
           jobs[jid] = { worker_class: worker_class, thread: Thread.current, started_at: Gitlab::Metrics::System.monotonic_time }