COSS removal from Squid-3

I'm expanding the COSS 'removal' from just 3.0 to all Squid-3.
The hoped for work has not yet been presented. When someone is available
they need to revert this patch. - Amos

  We had a vote on this some (several) months before 3.0 got branched, and
  it was decided to drop COSS from the Squid-3.0 branch once branched.
  Then the branching got delayed, and this task was forgotten when it
  finally branched.

  Until COSS gets significantly updated it's counter-productive to ship it
  in STABLE releases. But the current code needs to be kept in trunk as
  reference on how things got refactored for the day the current COSS code
  gets forward ported to Squid-3.

  Regards
  Henrik

diff --git a/configure.in b/configure.in
index aac87df123ad1dd1691f3aa39e1cec29c553b9e2..ae72562ba202e4cc2d42a6c533bead4a81602f93 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -445,7 +445,7 @@ AC_ARG_ENABLE(storeio,
   yes)
        for dir in $srcdir/src/fs/*; do
            module="`basename $dir`"
-           if test -d "$dir" && test "$module" != CVS; then
+           if test -d "$dir" && test "$module" != CVS && test "$module" != coss; then
                STORE_MODULES="$STORE_MODULES $module"
            fi
        done

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 9b63091ff5ab281702c63ce5b4dbd07a7ae2f963..eef5511ade84281563df07af71579a1a585b38f4 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -2147,6 +2147,10 @@ DOC_START
 
        The coss store type:
 
+       NP: COSS filesystem in Squid-3 has been deemed too unstable for
+           production use and has thus been removed from this release.
+           We hope that it can be made usable again soon.
+
        block-size=n defines the "block size" for COSS cache_dir's.
        Squid uses file numbers as block numbers.  Since file numbers
        are limited to 24 bits, the block size determines the maximum

diff --git a/src/fs/coss/CossSwapDir.h b/src/fs/coss/CossSwapDir.h
index 355887919f843a681eec8092929f3f5f0711ab4c..d56ae78ce7f6c8428fbc8378cdb7c8c891ae93fb 100644 (file)
--- a/src/fs/coss/CossSwapDir.h
+++ b/src/fs/coss/CossSwapDir.h
@@ -1,6 +1,4 @@
-/*
- * $Id$
- */
+#error COSS Support is not stable yet in Squid-3. Please do not use.
 #ifndef __COSSSWAPDIR_H__
 #define __COSSSWAPDIR_H__
 

diff --git a/src/fs/coss/StoreFScoss.cc b/src/fs/coss/StoreFScoss.cc
index c368f38bd855607c1dbe70025d748c81ed8c1aec..c7561e855433b65f568917151b1578c95a7932a7 100644 (file)
--- a/src/fs/coss/StoreFScoss.cc
+++ b/src/fs/coss/StoreFScoss.cc
@@ -1,4 +1,4 @@
-
+#error COSS Support is not stable yet in Squid-3. Please do not use.
 /*
  * $Id: StoreFScoss.cc,v 1.7 2006/09/03 21:05:21 hno Exp $
  *

diff --git a/src/fs/coss/StoreFScoss.h b/src/fs/coss/StoreFScoss.h
index db53d2e5273950e648261c7686df597af869b9f5..2584cbe8ea281d3214abb6fc7026ee74669b37e2 100644 (file)
--- a/src/fs/coss/StoreFScoss.h
+++ b/src/fs/coss/StoreFScoss.h
@@ -1,3 +1,4 @@
+#error COSS Support is not stable yet in Squid-3. Please do not use.
 /*
  * $Id: StoreFScoss.h,v 1.4 2008/02/26 21:49:43 amosjeffries Exp $
  *

diff --git a/src/fs/coss/coss-notes.txt b/src/fs/coss/coss-notes.txt
index d5b4bd1a6d8e36cdb2359f0d27fc4fb1efb7a69b..99fd4339dca07663f563d2320e3b4c696cf3ee9b 100644 (file)
--- a/src/fs/coss/coss-notes.txt
+++ b/src/fs/coss/coss-notes.txt
@@ -1,5 +1,13 @@
 COSS notes
 
+Amos Jeffries <squid3@treenet.co.nz>
+
+COSS Support is not stable yet in Squid-3. Please do not use.
+
+Any help porting the stability fixes from Squid 2.6 and 2.7
+is very welcome though to resolve this issue.
+
+
 Adrian Chadd <adrian@creative.net.au>
 
 $Id: coss-notes.txt,v 1.3 2003/08/27 21:19:38 wessels Exp $

diff --git a/src/fs/coss/store_coss.h b/src/fs/coss/store_coss.h
index b6c538d4f8d499feb26de74c4c0f5cbdc2e6d63d..376ac03f3602c9ce6b44a5033811d881758a1b84 100644 (file)
--- a/src/fs/coss/store_coss.h
+++ b/src/fs/coss/store_coss.h
@@ -1,3 +1,4 @@
+#error COSS Support is not stable yet in Squid-3. Please do not use.
 #ifndef __COSS_H__
 #define __COSS_H__
 

diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc
index 96f9a4ee9944c1a86e05549d611fa2d97447d766..889abfe32f940f6d9c5e52a59797b743e3755490 100644 (file)
--- a/src/fs/coss/store_dir_coss.cc
+++ b/src/fs/coss/store_dir_coss.cc
@@ -1,4 +1,4 @@
-
+#error COSS Support is not stable yet in Squid-3. Please do not use.
 /*
  * $Id: store_dir_coss.cc,v 1.77 2007/11/15 16:47:36 wessels Exp $
  * vim: set et :

diff --git a/src/tests/testDiskIO.cc b/src/tests/testDiskIO.cc
index 64609a34c1a7ab41faa1e6b43a2b95fb920d6ddc..fd013b09ebd0e3cf48acf66a92f8b6ae55aa4de9 100644 (file)
--- a/src/tests/testDiskIO.cc
+++ b/src/tests/testDiskIO.cc
@@ -8,7 +8,9 @@
 #include "SwapDir.h"
 #include "DiskIO/DiskIOModule.h"
 #include "fs/ufs/ufscommon.h"
+#if 0 // AYJ: COSS in Squid-3 is disabled.
 #include "fs/coss/CossSwapDir.h"
+#endif
 #include "Mem.h"
 #include "MemObject.h"
 #include "HttpHeader.h"