From 7558862fde71fe378776dda077f3fbc124857f4d Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Mon, 2 Jul 2012 12:27:29 -0700
Subject: [PATCH] Set gerrit http maxwait.

Set the timeout to 5000 minutes, which, due to a bug in gerrit
really means 5 minutes, which is the documented default value.

Change-Id: I85127cc44ed6f182a0e06083641d2d872f11d8b3
---
 manifests/site.pp                          | 10 ++++++++++
 manifests/stackforge.pp                    |  1 +
 modules/gerrit/templates/gerrit.config.erb |  3 +++
 3 files changed, 14 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 0fa3348a62..87b40c2d28 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -107,6 +107,15 @@ node default {
 # sshd.threads:
 # http://groups.google.com/group/repo-discuss/browse_thread/thread/b91491c185295a71
 
+# httpd.maxWait:
+# 12:07 <@spearce> httpd.maxwait defaults to 5 minutes and is how long gerrit
+#                  waits for an idle sshd.thread before aboring the http request
+# 12:08 <@spearce> ironically
+# 12:08 <@spearce> ProjectQosFilter passes this value as minutes
+# 12:08 <@spearce> to a method that accepts milliseconds
+# 12:09 <@spearce> so. you get 5 milliseconds before aborting
+# thus, set it to 5000minutes until the bug is fixed.
+
 node "review.openstack.org" {
   include openstack_cron
   class { 'openstack_server':
@@ -125,6 +134,7 @@ node "review.openstack.org" {
     core_packedgitlimit => '400m',
     core_packedgitwindowsize => '16k',
     sshd_threads => '100',
+    httpd_maxwait => '5000min',
     github_projects => [ {
                          name => 'openstack/keystone',
                          close_pull => 'true'
diff --git a/manifests/stackforge.pp b/manifests/stackforge.pp
index 97080e4b68..989c8f0ba5 100644
--- a/manifests/stackforge.pp
+++ b/manifests/stackforge.pp
@@ -40,6 +40,7 @@ node "review.stackforge.org" {
     ssl_key_file => '/etc/ssl/private/review.stackforge.org.key',
     ssl_chain_file => '/etc/ssl/certs/intermediate.crt',
     email => "review@stackforge.org",
+    httpd_maxwait => '5000min',
     sshd_threads => '100',
     github_projects => [ {
                          name => 'stackforge/MRaaS',
diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb
index c8166d7a16..11cef545ea 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -43,6 +43,9 @@
 <% end -%>
 [httpd]
 	listenUrl = proxy-https://*:8081/
+<% if httpd_maxwait != "" -%>
+	maxWait = <%= httpd_maxwait %>
+<% end -%>
 <% if httpd_acceptorthreads != "" -%>
 	acceptorThreads = <%= httpd_acceptorthreads %>
 <% end -%>