COSS removal from 3.0

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/src/cf.data.pre b/src/cf.data.pre
index 8c8d9c323572d6b6f761cb573e034c7ae65db98f..a71db37bcf27fa4f4dd56eeebfa6a188050f94a9 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1839,6 +1839,11 @@ DOC_START
 
        The coss store type:
 
+       NP: COSS filesystem in 3.0 has been deemed too unstable for
+           production use and has thus been removed from this 3.0
+           STABLE release. We hope that it can be made usable again
+           in a future release.
+
        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 29faf19cc229e136ebdca5da690c8e5c8851bab9..a3e14ceb119686cdfcd36e7ac5633da4bc0b52ff 100644 (file)
--- a/src/fs/coss/CossSwapDir.h
+++ b/src/fs/coss/CossSwapDir.h
@@ -1,3 +1,4 @@
+#error COSS Support is not stable in 3.0. 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 74c1b5485b1a4abae506fd342f8956b14e89f2b7..48b1054ff54b6132effe33bb48fa291fa88a56bf 100644 (file)
--- a/src/fs/coss/StoreFScoss.cc
+++ b/src/fs/coss/StoreFScoss.cc
@@ -1,4 +1,4 @@
-
+#error COSS Support is not stable in 3.0. 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 56ce5d94887a54fd55cd4cb63124c4f2e2a1eef4..b1712c0e6598680f63a68fad947f75d4cc895169 100644 (file)
--- a/src/fs/coss/StoreFScoss.h
+++ b/src/fs/coss/StoreFScoss.h
@@ -1,4 +1,4 @@
-
+#error COSS Support is not stable in 3.0. Please do not use.
 /*
  * $Id: StoreFScoss.h,v 1.3 2006/05/29 00:15:09 robertc Exp $
  *

diff --git a/src/fs/coss/coss-notes.txt b/src/fs/coss/coss-notes.txt
index d5b4bd1a6d8e36cdb2359f0d27fc4fb1efb7a69b..7b29a91c3ba22c0feab9a5262dafe1cc63cd8985 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 in 3.0. 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 f3766beffe3bf86e1aad1af13bebdba080fd9d72..5c786452d619f18cc5cd54323381b4b7e87f0689 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 in 3.0. 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 43d17627e8fdc289cca0ed8b0295826c8f8feaa9..47f865911af4cf1b956e52789598b1fb9c7ca694 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 in 3.0. 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 7881fe148fceff75f38a122c27c6a70975336d3b..0f8a298ed2ddc3bb581a1ccd8bee2e5d04f689b1 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 3.0 is disabled.
 #include "fs/coss/CossSwapDir.h"
+#endif
 #include "Mem.h"
 #include "MemObject.h"
 #include "HttpHeader.h"