------------------------------------------------------------
revno: 13226
revision-id: squid3@treenet.co.nz-20150801010012-16jfuhfc5hzyug0w
parent: squid3@treenet.co.nz-20150709032133-qg1patn5zngt4o4h
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Fri 2015-07-31 18:00:12 -0700
message:
  AUFS: Raise I/O queue congestion limits
  
  ... from 8 to 8196 before initial congestion message appears.
  
  Modern networks can be quite busy and even amateur installations have a
  much higher I/O throughput than Squid was originally designed for. This
  often results in a series of "Queue congestion" warnings appearing on
  startup before Squid learns what the local environment requires.
  
  The new limit helps to cater for this and reduce teh frequency of
  unnecessary warnings. They may still occur, so debug output is also
  updated to show what the queue length has grown to with each warning.
  
  Also updating the congestion counter from 32-bit to 64-bit unsigned
  since the new limit already consumes half the available growth bits in
  32-bit integer.
  
  NP: this update was triggered by reports from admin with proxies needing
      to expand AIO queues to over 4K entries on startup.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150801010012-16jfuhfc5hzyug0w
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: 6de4db169a371b7dc1ec8f5d52466a0472599bc0
# timestamp: 2015-08-01 01:03:05 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20150709032133-\
#   qg1patn5zngt4o4h
# 
# Begin patch
=== modified file 'src/DiskIO/DiskThreads/aiops.cc'
--- src/DiskIO/DiskThreads/aiops.cc	2012-12-29 02:40:12 +0000
+++ src/DiskIO/DiskThreads/aiops.cc	2015-08-01 01:00:12 +0000
@@ -523,13 +523,13 @@
     }
 
     if (request_queue2.head) {
-        static int filter = 0;
-        static int filter_limit = 8;
+        static uint64_t filter = 0;
+        static uint64_t filter_limit = 8192;
 
         if (++filter >= filter_limit) {
             filter_limit += filter;
             filter = 0;
-            debugs(43, DBG_IMPORTANT, "squidaio_queue_request: WARNING - Queue congestion");
+            debugs(43, DBG_IMPORTANT, "squidaio_queue_request: WARNING - Queue congestion (growing to " << filter_limit << ")");
         }
     }
 

=== modified file 'src/DiskIO/DiskThreads/aiops_win32.cc'
--- src/DiskIO/DiskThreads/aiops_win32.cc	2013-09-09 01:47:32 +0000
+++ src/DiskIO/DiskThreads/aiops_win32.cc	2015-08-01 01:00:12 +0000
@@ -606,13 +606,13 @@
     }
 
     if (request_queue2.head) {
-        static int filter = 0;
-        static int filter_limit = 8;
+        static uint64_t filter = 0;
+        static uint64_t filter_limit = 8196;
 
         if (++filter >= filter_limit) {
             filter_limit += filter;
             filter = 0;
-            debugs(43, DBG_IMPORTANT, "squidaio_queue_request: WARNING - Queue congestion");
+            debugs(43, DBG_IMPORTANT, "squidaio_queue_request: WARNING - Queue congestion (growing to " << filter_limit << ")");
         }
     }