DW:

 - Once again wasted time tracking down a hit ratio problem, eventually
   re-learning that storeDirSelectSwapDirLeastLoad() could return -1
   causing a swapout to fail.  This patch logs those cases to store.log.

diff --git a/src/enums.h b/src/enums.h
index 7415a469839dd504b9ccfd1eaeda4bbe0a7cf95d..92f77e728f5004889f9eaefe6a86da6442527056 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.169 2000/07/18 06:16:41 wessels Exp $
+ * $Id: enums.h,v 1.170 2000/07/21 06:06:22 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -636,7 +636,8 @@ enum {
     STORE_LOG_CREATE,
     STORE_LOG_SWAPIN,
     STORE_LOG_SWAPOUT,
-    STORE_LOG_RELEASE
+    STORE_LOG_RELEASE,
+    STORE_LOG_SWAPOUTFAIL
 };
 
 typedef enum {

diff --git a/src/store_log.cc b/src/store_log.cc
index 76c6e0df282890be1cf74216e45771b43eb7fb60..e29e46f9f517fed53991708d8cd8dbc70e348907 100644 (file)
--- a/src/store_log.cc
+++ b/src/store_log.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_log.cc,v 1.17 2000/06/25 22:28:43 wessels Exp $
+ * $Id: store_log.cc,v 1.18 2000/07/21 06:06:22 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager Logging Functions
  * AUTHOR: Duane Wessels
@@ -40,7 +40,8 @@ static char *storeLogTags[] =
     "CREATE",
     "SWAPIN",
     "SWAPOUT",
-    "RELEASE"
+    "RELEASE",
+    "SO_FAIL",
 };
 
 static Logfile *storelog = NULL;

diff --git a/src/store_swapout.cc b/src/store_swapout.cc
index ae508c25eb5e706addb4d2d285649844cb11cd45..9019802e97f7f5522f875014ce0d41c617f9c4f9 100644 (file)
--- a/src/store_swapout.cc
+++ b/src/store_swapout.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_swapout.cc,v 1.73 2000/06/27 22:06:05 hno Exp $
+ * $Id: store_swapout.cc,v 1.74 2000/07/21 06:06:22 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager Swapout Functions
  * AUTHOR: Duane Wessels
@@ -69,6 +69,7 @@ storeSwapOutStart(StoreEntry * e)
        e->swap_status = SWAPOUT_NONE;
        cbdataFree(c);
        xfree(buf);
+       storeLog(STORE_LOG_SWAPOUTFAIL, e);
        return;
     }
     storeLockObject(e);                /* Don't lock until after create, or the replacement