From: serassio <>
Date: Mon, 27 Jun 2005 00:51:20 +0000 (+0000)
Subject: Bug #1308: squid -k reconfigure internal corruption if the type of a
X-Git-Tag: SQUID_3_0_PRE4~719
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9e2e0e8b71fa8e5bbd17632663617f5452188b7;p=thirdparty%2Fsquid.git

Bug #1308: squid -k reconfigure internal corruption if the type of a
cache_dir is changed

Failed to detect if the type of an existing cache_dir was changed,
calling the parser function of the new type with the internal data of
the existing one..

This patch detects this and logs to cache.log (and the console) that a
restart is required.

Forward port of 2.5 patch.
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 24517f97cd..55b429bc86 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.475 2005/06/03 15:24:14 serassio Exp $
+ * $Id: cache_cf.cc,v 1.476 2005/06/26 18:51:20 serassio Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -1384,48 +1384,33 @@ parse_cachedir(_SquidConfig::_cacheSwap * swap)
     if ((path_str = strtok(NULL, w_space)) == NULL)
         self_destruct();
 
-    /*
-     * This bit of code is a little strange.
-     * See, if we find a path and type match for a given line, then
-     * as long as we're reconfiguring, we can just call its reconfigure
-     * function. No harm there.
-     *
-     * Trouble is, if we find a path match, but not a type match, we have
-     * a dilemma - we could gracefully shut down the fs, kill it, and
-     * create a new one of a new type in its place, BUT at this stage the
-     * fs is meant to be the *NEW* one, and so things go very strange. :-)
-     *
-     * So, we'll assume the person isn't going to change the fs type for now,
-     * and XXX later on we will make sure that its picked up.
-     *
-     * (moving around cache_dir lines will be looked at later in a little
-     * more sane detail..)
-     */
 
-    for (i = 0; i < swap->n_configured; i++) {
-        assert (swap->swapDirs[i].getRaw());
+    fs = find_fstype(type_str);
 
-        /* this is specific to on-fs Stores. The right
-         * way to handle this is probably to have a mapping 
-         * from paths to stores, and have on-fs stores
-         * register with that, and lookip in that in their
-         * own setup logic. RBC 20041225. TODO.
-         */
+    if (fs < 0)
+        self_destruct();
 
-        if (0 == strcasecmp(path_str, dynamic_cast<SwapDir *>(swap->swapDirs[i].getRaw())->
-                            path)) {
-            /* existing configured swap dir */
-            /* This is a little weird, you'll appreciate it later */
-            fs = find_fstype(type_str);
+    /* reconfigure existing dir */
 
-            if (fs < 0) {
-                fatalf("Unknown cache_dir type '%s'\n", type_str);
-            }
+    for (i = 0; i < swap->n_configured; i++) {
+        assert (swap->swapDirs[i].getRaw());
 
-            /* TODO: warn here on type changing */
+        if ((strcasecmp(path_str, dynamic_cast<SwapDir *>(swap->swapDirs[i].getRaw())->path)
+            ) == 0) {
+            /* this is specific to on-fs Stores. The right
+             * way to handle this is probably to have a mapping 
+             * from paths to stores, and have on-fs stores
+             * register with that, and lookip in that in their
+             * own setup logic. RBC 20041225. TODO.
+             */
 
             sd = dynamic_cast<SwapDir *>(swap->swapDirs[i].getRaw());
 
+            if (sd->type() != StoreFileSystem::FileSystems().items[fs]->type()) {
+                debug(3, 0) ("ERROR: Can't change type of existing cache_dir %s %s to %s. Restart required\n", sd->type(), sd->path, type_str);
+                return;
+            }
+
             sd->reconfigure (i, path_str);
 
             update_maxobjsize();
@@ -1434,21 +1419,20 @@ parse_cachedir(_SquidConfig::_cacheSwap * swap)
         }
     }
 
+    /* new cache_dir */
     assert(swap->n_configured < 63);	/* 7 bits, signed */
 
-    fs = find_fstype(type_str);
-
-    if (fs < 0) {
-        /* If we get here, we didn't find a matching cache_dir type */
-        fatalf("Unknown cache_dir type '%s'\n", type_str);
-    }
-
     allocate_new_swapdir(swap);
+
     swap->swapDirs[swap->n_configured] = StoreFileSystem::FileSystems().items[fs]->createSwapDir();
+
     sd = dynamic_cast<SwapDir *>(swap->swapDirs[swap->n_configured].getRaw());
+
     /* parse the FS parameters and options */
     sd->parse(swap->n_configured, path_str);
+
     ++swap->n_configured;
+
     /* Update the max object size */
     update_maxobjsize();
 }