Commit 293539ca authored by unknown's avatar unknown

merge, adopted structured event interface to filter out "PING" events c.f....

merge, adopted structured event interface to filter out "PING" events c.f. BUG#11898, ndb_mgmd does not release resources


parent fd152f68
...@@ -369,6 +369,9 @@ int ndb_logevent_get_next(const NdbLogEventHandle h, ...@@ -369,6 +369,9 @@ int ndb_logevent_get_next(const NdbLogEventHandle h,
Properties p; Properties p;
char buf[256]; char buf[256];
struct timeval start_time;
gettimeofday(&start_time, 0);
/* header */ /* header */
while (1) { while (1) {
if (in.gets(buf,sizeof(buf)) == 0) if (in.gets(buf,sizeof(buf)) == 0)
...@@ -383,7 +386,23 @@ int ndb_logevent_get_next(const NdbLogEventHandle h, ...@@ -383,7 +386,23 @@ int ndb_logevent_get_next(const NdbLogEventHandle h,
} }
if ( strcmp("log event reply\n", buf) == 0 ) if ( strcmp("log event reply\n", buf) == 0 )
break; break;
if ( strcmp("<PING>\n", buf) )
ndbout_c("skipped: %s", buf); ndbout_c("skipped: %s", buf);
struct timeval now;
gettimeofday(&now, 0);
unsigned elapsed_ms=
(now.tv_sec-start_time.tv_sec)*1000 +
(now.tv_usec-start_time.tv_usec)/1000;
if (elapsed_ms >= timeout_in_milliseconds)
{
// timed out
return 0;
}
new (&in) SocketInputStream(h->socket, timeout_in_milliseconds-elapsed_ms);
} }
/* read name-value pairs into properties object */ /* read name-value pairs into properties object */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment