From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 8 Sep 2008 13:14:01 +0000 (+1200)
Subject: COSS removal from 3.0
X-Git-Tag: SQUID_3_0_STABLE9~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2766f8f78829015451a78d1074898ef97412cc6;p=thirdparty%2Fsquid.git

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 8c8d9c3235..a71db37bcf 100644
--- 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 29faf19cc2..a3e14ceb11 100644
--- 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 74c1b5485b..48b1054ff5 100644
--- 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 56ce5d9488..b1712c0e65 100644
--- 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 d5b4bd1a6d..7b29a91c3b 100644
--- 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 f3766beffe..5c786452d6 100644
--- 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 43d17627e8..47f865911a 100644
--- 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 7881fe148f..0f8a298ed2 100644
--- 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"