testingrc/test

3 files changed, 9 insertions, 1 deletions

diff --git a/db/schema.rb b/db/schema.rb
index 9d367938cec..64f62759f44 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1906,6 +1906,7 @@ ActiveRecord::Schema.define(version: 20190515125613) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["path"], name: "index_redirect_routes_on_path", unique: true, using: :btree
+    t.index ["path"], name: "index_redirect_routes_on_path_text_pattern_ops", using: :btree, opclasses: {"path"=>"varchar_pattern_ops"}
     t.index ["source_type", "source_id"], name: "index_redirect_routes_on_source_type_and_source_id", using: :btree
   end
 
diff --git a/lib/gitlab/metrics/samplers/unicorn_sampler.rb b/lib/gitlab/metrics/samplers/unicorn_sampler.rb
index 1b6c52ac0bf..a149dbf20f3 100644
--- a/lib/gitlab/metrics/samplers/unicorn_sampler.rb
+++ b/lib/gitlab/metrics/samplers/unicorn_sampler.rb
@@ -58,7 +58,7 @@ module Gitlab
         end
 
         def unicorn_workers_count
-          Sys::ProcTable.ps.select {|p| p.cmdline.match(/unicorn_rails worker.+ #{Rails.root.to_s}/)}.count
+          Sys::ProcTable.ps(smaps: false).select {|p| p.cmdline.match(/unicorn_rails worker.+ #{Rails.root.to_s}/)}.count
         end
       end
     end
diff --git a/lib/gitlab/metrics/system.rb b/lib/gitlab/metrics/system.rb
index ce0bb82d138..48dae3b23ad 100644
--- a/lib/gitlab/metrics/system.rb
+++ b/lib/gitlab/metrics/system.rb
@@ -33,7 +33,14 @@ module Gitlab
         end
 
         def self.process_start_time
+          stat_string = File.read('/proc/self/stat')
+          start_time = stat_string.scan(/\S*/).reject { |match| match.empty? }[21]
+          puts "!!!!" * 100
+          puts "start_time from stat: #{start_time}"
           start_time_in_jiffies = Sys::ProcTable.ps(pid: Process.pid).starttime
+
+          puts "!!!!" * 100
+          puts "start_time from sysproctable: #{start_time_in_jiffies}"
           return 0 unless start_time_in_jiffies
 
           start_time_in_jiffies / 100