Changeset 647

Show
Ignore:
Timestamp:
04/01/2006 10:26:47 PM (3 years ago)
Author:
ahu
Message:

lower default buffer size, add cpu-use counters to rec_control & rrd graphs, fix broken error message on buffer sizing

Location:
trunk/pdns/pdns
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/pdns/pdns/pdns_recursor.cc

    r637 r647  
    189189   
    190190  if(!getsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char*)&psize, &len) && psize > size) { 
    191     L<<Logger::Error<<"Not decreasing socket buffer size from "<<psize<<" to "<<size<<"\n"; 
     191    L<<Logger::Error<<"Not decreasing socket buffer size from "<<psize<<" to "<<size<<endl; 
    192192    return;  
    193193  } 
    194194 
    195195  if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char*)&size, sizeof(size)) < 0 ) 
    196     L<<Logger::Error<<"Warning: unable to raise socket buffer size to "<<size<<": "<<strerror(errno)<<"\n"; 
     196    L<<Logger::Error<<"Warning: unable to raise socket buffer size to "<<size<<": "<<strerror(errno)<<endl; 
    197197} 
    198198 
    … …  
    393393  if(d_clientsock<0)  
    394394    throw AhuException("Making a socket for resolver: "+stringerror()); 
    395   setReceiveBuffer(d_clientsock, 450000);   
     395  setReceiveBuffer(d_clientsock, 200000);   
    396396  struct sockaddr_in sin; 
    397397  memset((char *)&sin,0, sizeof(sin)); 
    … …  
    473473    if(fd<0)  
    474474      throw AhuException("Making a server socket for resolver: "+stringerror()); 
    475     setReceiveBuffer(fd, 250000); 
     475    setReceiveBuffer(fd, 200000); 
    476476    struct sockaddr_in sin; 
    477477    memset((char *)&sin,0, sizeof(sin)); 

  • trunk/pdns/pdns/rec_channel_rec.cc

    r631 r647  
    1212#include <sys/stat.h> 
    1313#include <fcntl.h> 
     14#include <sys/time.h> 
     15#include <sys/resource.h> 
    1416#include "logger.hh" 
    1517 
    … …  
    1921map<string, const uint64_t*> d_get64bitpointers; 
    2022map<string, function< uint32_t() > >  d_get32bitmembers; 
    21  
    2223 
    2324void addGetStat(const string& name, const uint32_t* place) 
    … …  
    3334  d_get32bitmembers[name]=f; 
    3435} 
    35  
    36  
    3736 
    3837optional<uint64_t> get(const string& name)  
    … …  
    105104} 
    106105 
     106 
     107static uint64_t getSysTimeMsec() 
     108{ 
     109  struct rusage ru; 
     110  getrusage(RUSAGE_SELF, &ru); 
     111  return(ru.ru_stime.tv_sec*1000 + ru.ru_stime.tv_usec/1000); 
     112} 
     113 
     114static uint64_t getUserTimeMsec() 
     115{ 
     116  struct rusage ru; 
     117  getrusage(RUSAGE_SELF, &ru); 
     118  return(ru.ru_utime.tv_sec*1000 + ru.ru_utime.tv_usec/1000); 
     119} 
     120 
     121 
    107122RecursorControlParser::RecursorControlParser() 
    108123{ 
    … …  
    138153 
    139154  addGetStat("query-rate", getQueryRate); 
     155 
     156  addGetStat("user-msec", getUserTimeMsec); 
     157  addGetStat("sys-msec", getSysTimeMsec); 
    140158} 
    141159 

  • trunk/pdns/pdns/tools/rrd/create

    r640 r647  
    1 rrdtool create pdns_recursor.rrd -s 60 \ 
     1#!/bin/sh 
     2 
     3UPDATE_INTERVAL=60 
     4 
     5rrdtool create pdns_recursor.rrd -s $UPDATE_INTERVAL \ 
    26DS:questions:COUNTER:600:0:100000 \ 
    37DS:tcp-questions:COUNTER:600:0:100000 \ 
    … …  
    2226DS:answers-slow:COUNTER:600:0:100000 \ 
    2327DS:qa-latency:GAUGE:600:0:10000000 \ 
     28DS:user-msec:COUNTER:600:0:2000 \ 
     29DS:sys-msec:COUNTER:600:0:2000 \ 
    2430        RRA:AVERAGE:0.5:1:9600  \ 
    2531        RRA:AVERAGE:0.5:4:9600  \ 

  • trunk/pdns/pdns/tools/rrd/index.html

    r634 r647  
    22<body> 
    33<!-- 
    4 -rw-r--r--  1 ahu ahu 12918 2006-03-18 23:51 /var/www/caches-day.png 
    5 -rw-r--r--  1 ahu ahu 13174 2006-03-18 23:51 /var/www/load-day.png 
    6 -rw-r--r--  1 ahu ahu 12728 2006-03-18 23:51 /var/www/qoutq-day.png 
    7 -rw-r--r--  1 ahu ahu 12939 2006-03-18 23:51 /var/www/questions-day.png 
    8 -rw-r--r--  1 ahu ahu 12913 2006-03-18 23:51 /var/www/timeouts-day.png 
     4-rw-r--r--  1 ahu ahu 12918 2006-03-18 23:51 /var/www/caches-6h.png 
     5-rw-r--r--  1 ahu ahu 13174 2006-03-18 23:51 /var/www/load-6h.png 
     6-rw-r--r--  1 ahu ahu 12728 2006-03-18 23:51 /var/www/qoutq-6h.png 
     7-rw-r--r--  1 ahu ahu 12939 2006-03-18 23:51 /var/www/questions-6h.png 
     8-rw-r--r--  1 ahu ahu 12913 2006-03-18 23:51 /var/www/timeouts-6h.png 
    99--> 
    1010<h1>PowerDNS Recursor Performance Graphs</H1> 
    … …  
    2828be answered without generating any out-queries</td></tr> 
    2929</table> 
    30 <img src="latencies-day.png"> 
     30<img src="latencies-6h.png"> 
    3131<br> 
    32 <img src="qa-latency-day.png"> 
     32<img src="qa-latency-6h.png"> 
    3333<br> 
    34 <img src="qoutq-day.png"> 
     34<img src="qoutq-6h.png"> 
    3535<br> 
    36 <img src="timeouts-day.png"> 
     36<img src="timeouts-6h.png"> 
    3737<br> 
    38 <img src="questions-day.png"> 
     38<img src="questions-6h.png"> 
    3939<br> 
    40 <img src="tcp-questions-day.png"> 
     40<img src="tcp-questions-6h.png"> 
    4141<br> 
    42 <img src="caches-day.png"> 
     42<img src="caches-6h.png"> 
    4343<br> 
    44 <img src="caches2-day.png"> 
     44<img src="caches2-6h.png"> 
    4545<br> 
    46 <img src="load-day.png"> 
     46<img src="load-6h.png"> 
    4747<br> 
    48 <img src="hitrate-day.png"> 
     48<img src="hitrate-6h.png"> 
    4949 
    5050</body> 

  • trunk/pdns/pdns/tools/rrd/makegraphs

    r631 r647  
    101101        DEF:cachehits=pdns_recursor.rrd:cache-hits:AVERAGE  \ 
    102102        DEF:cachemisses=pdns_recursor.rrd:cache-misses:AVERAGE  \ 
     103        DEF:usermsec=pdns_recursor.rrd:user-msec:AVERAGE \ 
     104        DEF:sysmsec=pdns_recursor.rrd:sys-msec:AVERAGE \ 
    103105        CDEF:perc=cachehits,100,*,cachehits,cachemisses,+,/    \ 
    104         LINE2:perc#0000ff:"percentage cache hits"         
     106        CDEF:userperc=usermsec,10,/ \ 
     107        CDEF:sysperc=sysmsec,10,/ \ 
     108        LINE2:perc#0000ff:"percentage cache hits"  \ 
     109        AREA:userperc#ff0000:"user cpu percentage" \ 
     110        STACK:sysperc#00ff00:"system cpu percentage" \ 
     111        COMMENT:"\l" \ 
     112        COMMENT:"Cache hits " \ 
     113        GPRINT:perc:AVERAGE:"avg %-3.1lf%%\t" \ 
     114        GPRINT:perc:LAST:"last %-3.1lf%%\t" \ 
     115        GPRINT:perc:MAX:"max %-3.1lf%%" \ 
     116        COMMENT:"\l" \ 
     117        COMMENT:"System cpu " \ 
     118        GPRINT:sysperc:AVERAGE:"avg %-3.1lf%%\t" \ 
     119        GPRINT:sysperc:LAST:"last %-3.1lf%%\t" \ 
     120        GPRINT:sysperc:MAX:"max %-3.1lf%%\t" \ 
     121        COMMENT:"\l" \ 
     122        COMMENT:"User cpu   " \ 
     123        GPRINT:userperc:AVERAGE:"avg %-3.1lf%%\t" \ 
     124        GPRINT:userperc:LAST:"last %-3.1lf%%\t" \ 
     125        GPRINT:userperc:MAX:"max %-3.1lf%%" 
     126 
    105127} 
    106128         

  • trunk/pdns/pdns/tools/rrd/update

    r634 r647  
    11#!/bin/bash 
    2 #SOCKETDIR=/home/ahu/pdns/pdns/pdns/     
     2#SOCKETDIR=/home/ahu/work/pdns/pdns/pdns/     
    33SOCKETDIR=/var/run/ 
    44TSTAMP=$(date +%s) 
    … …  
    99           outgoing-timeouts nsspeeds-entries negcache-entries all-outqueries throttled-out\ 
    1010           cache-hits cache-misses answers0-1 answers1-10 answers10-100 answers100-1000 answers-slow\ 
    11         qa-latency throttle-entries" 
     11        qa-latency throttle-entries sys-msec user-msec" 
    1212 
    1313UVARIABLES=$(echo $VARIABLES | tr '[a-z]' '[A-Z]' | tr - _ )