tilecache: limit peer attempts per request

diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
index 903eeb6cfba3be754e804c329f339419283ada36..969b17754538f570d51493fd85394dad44315815 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -1,8 +1,8 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 upstream tile_cache_backend {
 # DO NOT EDIT - This file is being maintained by Chef
 
 upstream tile_cache_backend {

-  server 127.0.0.1:8080 max_fails=32 fail_timeout=2s;
-  server 127.0.0.2:8080 max_fails=32 fail_timeout=2s;
+  server 127.0.0.1:8080 max_fails=64 fail_timeout=2s;
+  # server 127.0.0.2:8080 max_fails=64 fail_timeout=2s;

 
   # Add the tile_siblings caches to relieve pressure if local squid failing
   # Balancer: round-robin
 
   # Add the tile_siblings caches to relieve pressure if local squid failing
   # Balancer: round-robin


@@ -12,7 +12,7 @@ upstream tile_cache_backend {
 <% if cache_peer == cache[:fqdn] -%>
 <% if cache[:hostname] != node[:hostname] -%>
 <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
 <% if cache_peer == cache[:fqdn] -%>
 <% if cache[:hostname] != node[:hostname] -%>
 <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>

-  server <%= address %>:80 weight=<%= server_weight.div(10) %> max_fails=32 fail_timeout=2s; # Server <%= cache[:hostname] %>
+  server <%= address %>:80 weight=<%= server_weight.div(10) %> max_fails=64 fail_timeout=2s; # Server <%= cache[:hostname] %>

 <% server_weight += 5 -%>
 <% end -%>
 <% end -%>
 <% server_weight += 5 -%>
 <% end -%>
 <% end -%>


@@ -256,6 +256,8 @@ server {
 
       proxy_connect_timeout 20s;
 
 
       proxy_connect_timeout 20s;
 

+      proxy_next_upstream_tries 3;
+

       # Replace host header.
       proxy_set_header Host 'tile.openstreetmap.org';
       # Do not pass cookies to backends.
       # Replace host header.
       proxy_set_header Host 'tile.openstreetmap.org';
       # Do not pass cookies to backends.