Don't select a swap dir for writing if its over the high water mark.

Flag selected dirs for debugging in cachemgr

diff --git a/src/store_dir.cc b/src/store_dir.cc
index 825c08d6f8f8af08956ca44b1fe47c8bdf27f7a8..99a743f9274bceda7372ae910edfeff5ecd85fbd 100644 (file)
--- a/src/store_dir.cc
+++ b/src/store_dir.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir.cc,v 1.82 1998/09/22 19:47:46 wessels Exp $
+ * $Id: store_dir.cc,v 1.83 1998/09/23 15:37:43 wessels Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -233,6 +233,8 @@ static int
 storeDirSelectSwapDir(void)
 {
     double least_used = 1.0;
+    double high = (double) Config.Swap.highWaterMark / 100.0;
+    double u;
     int dirn;
     int i, j;
     SwapDir *SD;
@@ -280,10 +282,13 @@ storeDirSelectSwapDir(void)
     for (i = 0; i < nconf; i++) {
        diru[i] = 1.1;
        SD = &Config.cacheSwap.swapDirs[i];
+       SD->flags.selected = 0;
        if (SD->read_only)
            continue;
-       diru[i] = (double) SD->cur_size;
-       diru[i] /= SD->max_size;
+       u = (double) SD->cur_size / SD->max_size;
+       if (u > high)
+           continue;
+       diru[i] = u;
     }
     for (j = 0; j < nleast; j++) {
        dirq[j] = -1;
@@ -299,6 +304,8 @@ storeDirSelectSwapDir(void)
            break;
        dirq[j] = dirn;
        diru[dirn] = 1.1;
+       /* set selected flag for debugging/cachemgr only */
+       Config.cacheSwap.swapDirs[dirn].flags.selected = 1;
     }
     /*
      * Setup default return of 0 if no least found
@@ -611,6 +618,10 @@ storeDirStats(StoreEntry * sentry)
                percent(sfs.f_files - sfs.f_ffree, sfs.f_files));
        }
 #endif
+       storeAppendPrintf(sentry, "Flags:");
+       if (SD->flags.selected)
+           storeAppendPrintf(sentry, " SELECTED");
+       storeAppendPrintf(sentry, "\n");
     }
 }
 

diff --git a/src/structs.h b/src/structs.h
index 8e0c9c2addc1092d8c44c579778000d76dd4ccc4..9502bbba42275612bd25f1b5abb5b9ed5c253f62 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,7 +1,7 @@
 
 
 /*
- * $Id: structs.h,v 1.233 1998/09/22 23:15:41 wessels Exp $
+ * $Id: structs.h,v 1.234 1998/09/23 15:37:44 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -1246,6 +1246,9 @@ struct _SwapDir {
     int suggest;
     fileMap *map;
     int swaplog_fd;
+    struct {
+       unsigned int selected:1;
+    } flags;
 };
 
 struct _request_flags {