From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 1 Dec 2015 10:41:09 +0000 (+0100)
Subject: our messages on filedescriptors were hard to understand
X-Git-Tag: dnsdist-1.0.0-alpha1~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=067ad20e5972007884cad0fe9255bb7e0cf11860;p=thirdparty%2Fpdns.git

our messages on filedescriptors were hard to understand
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 8da6b6a677..8f063f28bd 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2005,15 +2005,16 @@ static void checkOrFixFDS()
   unsigned int wantFDs = g_maxMThreads * g_numWorkerThreads +25; // even healthier margin then before
 
   if(wantFDs > availFDs) {
-    if(getFilenumLimit(true) >= wantFDs) {
+    unsigned int hardlimit= getFilenumLimit(true);
+    if(hardlimit >= wantFDs) {
       setFilenumLimit(wantFDs);
       L<<Logger::Warning<<"Raised soft limit on number of filedescriptors to "<<wantFDs<<" to match max-mthreads and threads settings"<<endl;
     }
     else {
-      int newval = getFilenumLimit(true) / g_numWorkerThreads;
-      L<<Logger::Warning<<"Insufficient number of filedescriptors available for max-mthreads*threads setting! ("<<availFDs<<" < "<<wantFDs<<"), reducing max-mthreads to "<<newval<<endl;
+      int newval = (hardlimit - 25) / g_numWorkerThreads;
+      L<<Logger::Warning<<"Insufficient number of filedescriptors available for max-mthreads*threads setting! ("<<hardlimit<<" < "<<wantFDs<<"), reducing max-mthreads to "<<newval<<endl;
       g_maxMThreads = newval;
-      setFilenumLimit(getFilenumLimit(true));
+      setFilenumLimit(hardlimit);
     }
   }
 }