STABLE14-vol-setaside-one-fd-per-thread-20080423

LICENSE IPL10
FIXES 87977

kids these days share badly. give each one their own fd otherwise they fight.

(cherry picked from commit 6809ba29fadbd0d84ff6a9bf2ccd909b2f54b186)

diff --git a/src/viced/viced.h b/src/viced/viced.h
index 3b230e5311941ba11507cb912e3d6c73674c152f..0b38c2ac1c05170477d118608b580e06749dab2a 100644 (file)
--- a/src/viced/viced.h
+++ b/src/viced/viced.h
@@ -196,7 +196,7 @@ extern int busyonrst;
 #define DONTPANIC 0
 #define PANIC 1
 
-#define MAX_FILESERVER_THREAD  128     /* max number of threads in fileserver, subject to system limits */
+#define MAX_FILESERVER_THREAD  128     /* max number of threads in fileserver, subject to system limits. match to FD_HANDLE_SETASIDE */
 
 #define FILESERVER_HELPER_THREADS 7    /* Listner, IOMGR, FiveMinute, 
                                         * HostCheck, Signal, min 2 for RXSTATS */

diff --git a/src/vol/ihandle.h b/src/vol/ihandle.h
index 5b918f8a77f51c8888e37184dffa93551adb5d30..b0bb3b238f6d3c5bb99c0db8ec843efa867d068d 100644 (file)
--- a/src/vol/ihandle.h
+++ b/src/vol/ihandle.h
@@ -193,7 +193,7 @@ typedef struct StreamHandle_s {
 #define STREAM_HANDLE_MALLOCSIZE 1
 
 /* Number of file descriptors needed for non-cached I/O */
-#define FD_HANDLE_SETASIDE     64
+#define FD_HANDLE_SETASIDE     128 /* Match to MAX_FILESERVER_THREAD */
 
 /* Don't try to have more than 256 files open at once if you are planning
  * to use fopen or fdopen. The FILE structure has an eight bit field for