Merge branch 'revert-unicorn-timeout' into 'master'

Revert "Increase timeout for Git-over-HTTP requests." This reverts commit 516bcabb. For #2164 cc @marin @douwe See merge request !1730

Merge branch 'revert-unicorn-timeout' into 'master'
Revert "Increase timeout for Git-over-HTTP requests." This reverts commit 516bcabb. For #2164 cc @marin @douwe See merge request !1730
b99221e6 · Dmitriy Zaporozhets · d5a259d4 · efd8491d · b99221e6 · b99221e6
Commit b99221e6 authored Mar 20, 2015 by Dmitriy Zaporozhets
6 changed files
--- a/Gemfile
+++ b/Gemfile
@@ -180,9 +180,6 @@ gem 'mousetrap-rails'
 # Detect and convert string character encoding
 gem 'charlock_holmes'
-# Shutting down requests that take too long
-gem "slowpoke"
 gem "sass-rails", '~> 4.0.2'
 gem "coffee-rails"
 gem "uglifier"

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -147,7 +147,6 @@ GEM
    enumerize (0.7.0)
      activesupport (>= 3.2)
    equalizer (0.0.8)
-    errbase (0.0.2)
    erubis (2.7.0)
    escape_utils (0.2.4)
    eventmachine (1.0.4)
@@ -429,7 +428,6 @@ GEM
      rack
    rack-test (0.6.3)
      rack (>= 1.0)
-    rack-timeout (0.2.0)
    rails (4.1.9)
      actionmailer (= 4.1.9)
      actionpack (= 4.1.9)
@@ -482,8 +480,6 @@ GEM
    rest-client (1.6.7)
      mime-types (>= 1.16)
    rinku (1.7.3)
-    robustly (0.0.3)
-      errbase
    rouge (1.7.4)
    rspec (2.99.0)
      rspec-core (~> 2.99.0)
@@ -566,9 +562,6 @@ GEM
      temple (~> 0.6.6)
      tilt (>= 1.3.3, < 2.1)
    slop (3.6.0)
-    slowpoke (0.0.5)
-      rack-timeout (>= 0.1.0)
-      robustly
    spinach (0.8.7)
      colorize (= 0.5.8)
      gherkin-ruby (>= 0.3.1)
@@ -776,7 +769,6 @@ DEPENDENCIES
  six
  slack-notifier (~> 1.0.0)
  slim
-  slowpoke
  spinach-rails
  spring (~> 1.3.1)
  spring-commands-rspec (= 1.0.4)

--- a/config/initializers/timeout.rb
+++ b/config/initializers/timeout.rb
-# Slowpoke extends Rack::Timeout to gracefully kill Unicorn workers so they can clean up state.
-Slowpoke.timeout = 60
-# The `Rack::Timeout` middleware kills requests after 60 seconds (as set above).
-# We're replacing it with our `Gitlab::Middleware::Timeout` that does the same,
-# except ignoring Git-over-HTTP requests, letting those take as long as they need.
-Rails.application.config.middleware.swap(Rack::Timeout, Gitlab::Middleware::Timeout)
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -35,10 +35,22 @@ working_directory "/home/git/gitlab" # available in 0.94.0+
 listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024
 listen "127.0.0.1:8080", :tcp_nopush => true
-# Kill workers after 1 hour.
+# nuke workers after 30 seconds instead of 60 seconds (the default)
-# A shorter timeout of 60 seconds is enforced by rack-timeout for web requests.
+#
-# Git-over-HTTP only has the below timeout since large pulls/pushes can take a long time.
+# NOTICE: git push over http depends on this value.
-timeout 60 * 60
+# If you want be able to push huge amount of data to git repository over http
+# you will have to increase this value too.
+#
+# Example of output if you try to push 1GB repo to GitLab over http.
+#   -> git push http://gitlab.... master
+#
+#   error: RPC failed; result=18, HTTP code = 200
+#   fatal: The remote end hung up unexpectedly
+#   fatal: The remote end hung up unexpectedly
+#
+# For more information see http://stackoverflow.com/a/21682112/752049
+#
+timeout 60
 # feel free to point this anywhere accessible on the filesystem
 pid "/home/git/gitlab/tmp/pids/unicorn.pid"

--- a/lib/gitlab/middleware/timeout.rb
+++ b/lib/gitlab/middleware/timeout.rb
-module Gitlab
-  module Middleware
-    class Timeout < Rack::Timeout
-      GRACK_REGEX = /[-\/\w\.]+\.git\//.freeze
-      def call(env)
-        return @app.call(env) if env['PATH_INFO'] =~ GRACK_REGEX
-        super
-      end
-    end
-  end
-end
--- a/public/503.html
+++ b/public/503.html
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Page took too long to load (503)</title>
-  <link href="/static.css" media="screen" rel="stylesheet" type="text/css" />
-</head>
-<body>
-  <h1>503</h1>
-  <h3>Page took too long to load.</h3>
-  <hr/>
-  <p>Please contact your GitLab administrator if this problem persists.</p>
-</body>
-</html>