------------------------------------------------------------ revno: 12582 revision-id: squid3@treenet.co.nz-20130630084509-vbt8a1zm9ww9xvkq parent: squid3@treenet.co.nz-20130629082349-k81kj6k0dxet5dl4 fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3762 committer: Amos Jeffries branch nick: 3.3 timestamp: Sun 2013-06-30 02:45:09 -0600 message: Bug 3762: remove bogus WARNING in cache.log The warning is bogus for several reasons: * it appears with memory-only cache configurations * it only checks the size of first SwapDir (as seen in bug 3762) * very large memory spaces are now possible which may make disk appear small by comparison. Its usefulness in detecting memory and disk misconfigurations has long been almosy nil. Removing this entirey to resolve the bogus noise in the above mentioned legitimate configurations. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20130630084509-vbt8a1zm9ww9xvkq # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: f16f9c194749894e43be953baebeeac03da5088a # timestamp: 2013-06-30 08:54:27 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20130629082349-\ # k81kj6k0dxet5dl4 # # Begin patch === modified file 'src/cache_cf.cc' --- src/cache_cf.cc 2013-05-19 02:43:38 +0000 +++ src/cache_cf.cc 2013-06-30 08:45:09 +0000 @@ -674,12 +674,6 @@ Config.Store.maxObjectSize = 0x7FFF0000; } #endif - if (0 == Store::Root().maxSize()) - /* people might want a zero-sized cache on purpose */ - (void) 0; - else if (Store::Root().maxSize() < Config.memMaxSize) - /* This is bogus. folk with NULL caches will want this */ - debugs(3, DBG_CRITICAL, "WARNING cache_mem is larger than total disk cache space!"); if (Config.Announce.period > 0) { Config.onoff.announce = 1;