Forks/privacore-open-source-search-engine
1
0
Fork 0
forked from Mirrors/privacore-open-source-search-engine
Code Pull Requests Activity

Remove slowDiskReads statistics

Browse Source
This commit is contained in:
Ai Lin Chia
2017-03-28 11:11:00 +02:00
parent a4708e06a8
commit 94674449bd
7 changed files with 1 additions and 56 deletions

1
Hostdb.cpp

@ -1435,7 +1435,6 @@ void Hostdb::updatePingInfo(Host *h, const PingInfo &pi) {
h->m_pingInfo.m_percentMemUsed = pi.m_percentMemUsed;
h->m_pingInfo.m_cpuUsage = pi.m_cpuUsage;
h->m_pingInfo.m_totalDocsIndexed = pi.m_totalDocsIndexed;
h->m_pingInfo.m_slowDiskReads = pi.m_slowDiskReads;
h->m_pingInfo.m_hostsConfCRC = pi.m_hostsConfCRC;
h->m_pingInfo.m_diskUsage = pi.m_diskUsage;
h->m_pingInfo.m_flags = pi.m_flags;

1
Hostdb.h

@ -58,7 +58,6 @@ public:
float m_percentMemUsed;
float m_cpuUsage;
int32_t m_totalDocsIndexed;
int32_t m_slowDiskReads;
int32_t m_hostsConfCRC;
float m_diskUsage;
int32_t m_flags;

30
PageHosts.cpp

@ -14,7 +14,6 @@ static int pingSort1 ( const void *i1, const void *i2 );
static int pingSort2 ( const void *i1, const void *i2 );
static int pingAgeSort ( const void *i1, const void *i2 );
static int pingMaxSort ( const void *i1, const void *i2 );
static int slowDiskSort ( const void *i1, const void *i2 );
static int splitTimeSort ( const void *i1, const void *i2 );
static int flagSort ( const void *i1, const void *i2 );
static int resendsSort ( const void *i1, const void *i2 );
@ -155,9 +154,6 @@ skipReplaceHost:
"<td><a href=\"/admin/hosts?c=%s&sort=12\">"
"<b>status</b></a></td>"
"<td><a href=\"/admin/hosts?c=%s&sort=15\">"
"<b>slow reads</b></a></td>"
"<td><b>docs indexed</a></td>"
"<td><a href=\"/admin/hosts?c=%s&sort=9\">"
@ -197,7 +193,6 @@ skipReplaceHost:
cs,
cs,
cs,
cs,
shotcol );
// loop through each host we know and print it's stats
@ -214,8 +209,6 @@ skipReplaceHost:
h->m_dgramsFrom = 0;
h->m_splitTimes = 0;
h->m_splitsDone = 0;
h->m_pingInfo.m_slowDiskReads =0;
}
}
@ -238,7 +231,7 @@ skipReplaceHost:
case 12:gbsort ( hostSort, nh, sizeof(int32_t), flagSort ); break;
case 13:gbsort ( hostSort, nh, sizeof(int32_t), splitTimeSort ); break;
case 14:gbsort ( hostSort, nh, sizeof(int32_t), pingMaxSort ); break;
case 15:gbsort ( hostSort, nh, sizeof(int32_t), slowDiskSort ); break;
//case 15:
case 16:gbsort ( hostSort, nh, sizeof(int32_t), defaultSort ); break;
case 17:gbsort ( hostSort, nh, sizeof(int32_t), diskUsageSort ); break;
@ -606,10 +599,6 @@ skipReplaceHost:
sb.safePrintf("\t\t<status><![CDATA[%s]]></status>\n",
fb.getBufStart());
sb.safePrintf("\t\t<slowDiskReads>%" PRId32
"</slowDiskReads>\n",
h->m_pingInfo.m_slowDiskReads);
sb.safePrintf("\t\t<docsIndexed>%" PRId32
"</docsIndexed>\n",
h->m_pingInfo.m_totalDocsIndexed);
@ -720,9 +709,6 @@ skipReplaceHost:
sb.safePrintf("\t\t\t\t\"status\":\"%s\",\n",
fb.getBufStart());
sb.safePrintf("\t\t\t\t\"slowDiskReads\":%" PRId32",\n",
h->m_pingInfo.m_slowDiskReads);
sb.safePrintf("\t\t\t\t\"docsIndexed\":%" PRId32",\n",
h->m_pingInfo.m_totalDocsIndexed);
@ -815,9 +801,6 @@ skipReplaceHost:
// flags
"<td>%s</td>"
// slow disk reads
"<td>%" PRId32"</td>"
// docs indexed
"<td>%" PRId32"</td>"
@ -864,7 +847,6 @@ skipReplaceHost:
fb.getBufStart(),//flagString,
h->m_pingInfo.m_slowDiskReads,
h->m_pingInfo.m_totalDocsIndexed,
fontTagFront,
@ -1284,16 +1266,6 @@ int pingMaxSort ( const void *i1, const void *i2 ) {
return 0;
}
int slowDiskSort ( const void *i1, const void *i2 ) {
Host *h1 = g_hostdb.getHost ( *(int32_t*)i1 );
Host *h2 = g_hostdb.getHost ( *(int32_t*)i2 );
PingInfo *p1 = &h1->m_pingInfo;
PingInfo *p2 = &h2->m_pingInfo;
if ( p1->m_slowDiskReads > p2->m_slowDiskReads ) return -1;
if ( p1->m_slowDiskReads < p2->m_slowDiskReads ) return 1;
return 0;
}
int pingAgeSort ( const void *i1, const void *i2 ) {
Host *h1 = g_hostdb.getHost ( *(int32_t*)i1 );
Host *h2 = g_hostdb.getHost ( *(int32_t*)i2 );

18
PagePerf.cpp

@ -103,25 +103,7 @@ bool sendPagePerf ( TcpSocket *s , HttpRequest *r ) {
"<table %s>"
// black
"<tr class=poo>"
"<td bgcolor=#000000>&nbsp; &nbsp;</td>"
"<td> High priority disk read. "
"Thicker lines for bigger reads.</td>"
// grey
"<td bgcolor=#808080>&nbsp; &nbsp;</td>"
"<td> Low priority disk read. "
"Thicker lines for bigger reads.</td>"
"</tr>"
// red
"<tr class=poo>"
"<td bgcolor=#ff0000>&nbsp; &nbsp;</td>"
"<td> Disk write. "
"Thicker lines for bigger writes.</td>"
// blue
"<td bgcolor=#0000ff>&nbsp; &nbsp;</td>"
"<td> Summary extraction for one document.</td>"

3
PingServer.cpp

@ -272,9 +272,6 @@ void PingServer::pingHost ( Host *h , uint32_t ip , uint16_t port ) {
// our num recs, docsIndexed
newPingInfo.m_totalDocsIndexed = (int32_t)g_process.getTotalDocsIndexed();
// slow disk reads
newPingInfo.m_slowDiskReads = g_stats.m_slowDiskReads;
// and hosts.conf crc
newPingInfo.m_hostsConfCRC = g_hostdb.getCRC();

1
Stats.cpp

@ -14,7 +14,6 @@ Stats::Stats ( ) {
m_next = 0;
memset ( m_pts , 0 , sizeof(StatPoint)*MAX_POINTS );
m_slowDiskReads = 0;
m_closedSockets = 0;
memset(m_msg3aRecalls, 0, sizeof(m_msg3aRecalls));

3
Stats.h

@ -60,9 +60,6 @@ class Stats {
int64_t m_startTime;
// set in BigFile.cpp
int32_t m_slowDiskReads;
// when we have to close a socket because too many are open.. count it
int32_t m_closedSockets;